--- parser3/src/classes/op.C 2002/02/08 08:30:10 1.71 +++ parser3/src/classes/op.C 2002/03/27 15:30:34 1.78 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: op.C,v 1.71 2002/02/08 08:30:10 paf Exp $ + $Id: op.C,v 1.78 2002/03/27 15:30:34 paf Exp $ */ #include "classes.h" @@ -59,7 +59,7 @@ static void _untaint(Request& r, const S const String& lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) - throw Exception(0, 0, + throw Exception(0, &lang_name, "invalid taint language"); } @@ -82,7 +82,7 @@ static void _taint(Request& r, const Str const String& lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) - throw Exception(0, 0, + throw Exception(0, &lang_name, "invalid taint language"); } @@ -112,7 +112,10 @@ static void _process(Request& r, const S #endif VStateless_class& self_class=*r.self->get_class(); + const Method *main_method; { + // 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, *main_method_name, 0); // temporary zero @auto so it wouldn't be auto-called in Request::use_buf @@ -129,11 +132,14 @@ static void _process(Request& r, const S place, &self_class); - // maybe-execute @main[] - if(const Method *method=self_class.get_method(*main_method_name)) { - // execute! - r.execute(*method->parser_code); - } + // main_method + main_method=self_class.get_method(*main_method_name); + } + // after restoring current-request-lang + // maybe-execute @main[] + if(main_method) { + // execute! + r.execute(*main_method->parser_code); } } @@ -151,7 +157,7 @@ static void _while(Request& r, const Str int endless_loop_count=0; while(true) { if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "endless loop detected"); @@ -182,7 +188,7 @@ static void _for(Request& r, const Strin Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; if(to-from>=MAX_LOOPS) // too long loop? - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "endless loop detected"); @@ -221,17 +227,6 @@ static void _eval(Request& r, const Stri r.write_no_lang(*result); } -static void _error(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - const String& serror=params->as_string(0, "message must be string"); - throw Exception(0, 0, - &method_name, - "%s", serror.cstr()); -} - - -/// @todo rewrite ugly code with try/try to autoobject TempConnection static void _connect(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); #ifdef RESOURCES_DEBUG @@ -265,8 +260,7 @@ r.sql_connect_time+=t[1]-t[0]; // execute body try { r.write_assign_lang(r.process(body_code)); - - } catch(...) { // process/commit problem + } catch(...) { // process problem connection->mark_to_rollback(); /*re*/throw; } @@ -297,7 +291,7 @@ static void _case(Request& r, const Stri Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); if(!data) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "without switch"); @@ -387,34 +381,26 @@ Value *locked_process_and_cache_put(Requ } String *cache_get(Pool& pool, const String& file_spec) { void* data; size_t data_size; - if(!file_read(pool, file_spec, + if(file_read(pool, file_spec, data, data_size, false/*as_text*/, false/*fail_on_read_problem*/) - || !data_size/* ignore reads which are empty due to - non-unary open+lockEX conflict with lockSH */) - return 0; + && data_size/* ignore reads which are empty due to + non-unary open+lockEX conflict with lockSH */) { - Data_string_serialized_prolog& prolog= - *static_cast(data); - - if(data_size(data); - if(prolog.version!=DATA_STRING_SERIALIZED_VERSION) - throw Exception(0, 0, - &file_spec, - "data string version 0x%04X not equal to 0x%04X, recreate file", - prolog.version, DATA_STRING_SERIALIZED_VERSION); + String *result=new(pool) String(pool); + if( + data_size>=sizeof(Data_string_serialized_prolog) + && prolog.version==DATA_STRING_SERIALIZED_VERSION + && result->deserialize( + sizeof(Data_string_serialized_prolog), data, data_size, file_spec.cstr())) + return result; + } - String& result=*new(pool) String(pool); - result.deserialize( - sizeof(Data_string_serialized_prolog), - data, data_size, file_spec.cstr()); - return &result; + return 0; } static void _cache(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -473,7 +459,7 @@ static void _cache(Request& r, const Str retry=0; // prolonging our wait, than could cache_get it, without processing body_code } } - throw Exception(0, 0, + throw Exception(0, &file_spec, "locking problem"); } else { @@ -489,6 +475,111 @@ static void _cache(Request& r, const Str // never reached } +// also used in pa_request.C to pass param to @unhandled_exception +VHash& exception2vhash(Pool& pool, const Exception& e) { + VHash& result=*new(pool) VHash(pool); + Hash& hash=result.hash(0); + if(const char *type=e.type()) + hash.put(*exception_type_part_name, new(pool) VString(*new(pool) String(pool, type))); + if(const String *asource=e.problem_source()) { + String& source=*new(pool) String(pool); + source.append(*asource, String::UL_TAINTED, true/*forced*/); + result.set_name(source); + + hash.put(*exception_source_part_name, new(pool) VString(source)); +#ifndef NO_STRING_ORIGIN + const Origin& origin=source.origin(); + hash.put(*new(pool) String(pool, "file"), + new(pool) VString(*new(pool) String(pool, origin.file))); + hash.put(*new(pool) String(pool, "lineno"), + new(pool) VInt(pool, 1+origin.line)); +#endif + } + if(const char *ecomment=e.comment()) { + int comment_size=strlen(ecomment); + char *pcomment=(char *)pool.malloc(comment_size); + memcpy(pcomment, ecomment, comment_size); + hash.put(*exception_comment_part_name, + new(pool) VString(*new(pool) String(pool, pcomment, comment_size, true/*tainted*/))); + } + hash.put(*exception_handled_part_name, + new(pool) VBool(pool, false)); + + return result; +} + +static void _try_operator(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Value& body_code=params->as_junction(0, "body_code must be code"); + Value& catch_code=params->as_junction(1, "catch_code must be code"); + + Value *result; + + // taking snapshot of request processing status + //int ssexception_trace=r.exception_trace.top_index(); + int sstack=r.stack.top_index(); + Value *sself=r.self, *sroot=r.root, *srcontext=r.rcontext; + WContext *swcontext=r.wcontext; + try { + result=&r.process(body_code); + } catch(const Exception& e) { + // restoring request processing status + //r.exception_trace.top_index(ssexception_trace); + r.stack.top_index(sstack); + r.self=sself; r.root=sroot, r.rcontext=srcontext; r.wcontext=swcontext; + + + VHash& vhash=exception2vhash(pool, e); + + Junction *junction=catch_code.get_junction(); + Value *saved_exception_var_value=junction->root->get_element(*exception_var_name); + junction->root->put_element(*exception_var_name, &vhash); + result=&r.process(catch_code); + bool handled=false; + if(Value *value=static_cast(vhash.hash(0).get(*exception_handled_part_name))) + handled=value->as_bool(); + junction->root->put_element(*exception_var_name, saved_exception_var_value); + + if(!handled) + throw(e); // rethrow + } + // write it out + r.write_pass_lang(*result); +} + +static void _throw_operator(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + if(params->size()==1) { + Value& param0=params->get(0); + if(Hash *hash=param0.get_hash(&method_name)) { + const char *type=0; + if(Value *value=static_cast(hash->get(*exception_type_part_name))) + type=value->as_string().cstr(); + const String *source=0; + if(Value *value=static_cast(hash->get(*exception_source_part_name))) + source=&value->as_string(); + const char *comment=0; + if(Value *value= + static_cast(hash->get(*exception_comment_part_name))) + comment=value->as_string().cstr(); + + throw Exception(type, + source?source:&method_name, + comment); + } else + throw Exception("parser.runtime", + &method_name, + "one-param version has hash param"); + } else { + const char *type=params->as_string(0, "type must be string").cstr(); + const String& source=params->as_string(1, "source must be string"); + const char *comment=params->as_string(2, "comment must be string").cstr(); + throw Exception(type, &source, comment); + } +} + // constructor MOP::MOP(Pool& apool) : Methoded(apool), @@ -526,10 +617,6 @@ MOP::MOP(Pool& apool) : Methoded(apool), // ^eval(expr)[format] add_native_method("eval", Method::CT_ANY, _eval, 1, 2); - // ^error[msg] - add_native_method("error", Method::CT_ANY, _error, 1, 1); - - // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); @@ -545,6 +632,15 @@ MOP::MOP(Pool& apool) : Methoded(apool), // ^case[value]{code} add_native_method("case", Method::CT_ANY, _case, 2, 10000); + + // try-catch + + // ^try{code}{catch code} + add_native_method("try", Method::CT_ANY, _try_operator, 2, 2); + // ^throw[$exception hash] + // ^throw[type;source;comment] + add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3); + } // constructor & configurator