--- parser3/src/classes/op.C 2026/01/07 14:48:54 1.276 +++ parser3/src/classes/op.C 2026/09/25 12:55:42 1.282 @@ -1,7 +1,7 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -17,12 +17,13 @@ #include "pa_vmethod_frame.h" #include "pa_vclass.h" #include "pa_charset.h" +#include "pa_varray.h" #ifdef HAVE_SYSLOG #include "syslog.h" #endif -volatile const char * IDENT_OP_C="$Id: op.C,v 1.276 2026/01/07 14:48:54 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.282 2026/09/25 12:55:42 moko Exp $"; // defines @@ -536,7 +537,6 @@ template static Try_catch_result try_catch(Request& r, Value& body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) { Try_catch_result result; - // minor bug: context not restored if only finally code is present, see #1062 if(!catch_code) { result.processed_code=body_code(r, info); return result; @@ -544,38 +544,48 @@ static Try_catch_result try_catch(Reques // taking snapshot of try-context Request_context_saver try_context(r); + size_t trace_start=r.exception_trace.top_index(); + try { result.processed_code=body_code(r, info); } catch(const Exception& e) { - Request_context_saver throw_context(r); // remembering exception stack trace + size_t trace_bottom=r.exception_trace.bottom_index(); + size_t trace_top=r.exception_trace.top_index(); - Request::Exception_details details=r.get_details(e); + VException& details=*new VException(r, e); - try_context.restore(); // restoring try-context for code after try and catch-code + try_context.restore(); // restoring try-context for catch code - { - Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details.vhash); - Temp_skip temp_skip(r); - result.processed_code=r.process(*catch_code); - } - - // retriving $exception.handled - Value* vhandled=details.vhash.hash().get(exception_handled_part_name); + r.exception_trace.set_bottom_index(trace_top); // keep the original trace occupied; errors in catch start after it bool bhandled=false; - if(vhandled) { - if(vhandled->is_string()) { // not simple $exception.handled(1/0)? - if(bhandled=could_be_handled_by_caller) { // and we can possibly handle it - result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover - } - } else - bhandled=vhandled->as_bool(); + try { + { + Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details); + Temp_skip temp_skip(r); + result.processed_code=r.process(*catch_code); + } + + Value* vhandled=details.handled(); + if(vhandled) { + if(vhandled->is_string()) { // not simple $exception.handled(1/0)? + if(bhandled=could_be_handled_by_caller) { // and we can possibly handle it + result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover + } + } else + bhandled=vhandled->as_bool(); + } + } catch(...) { + // restore execution for finally, but keep new error trace. + try_context.restore(); + rethrow; } if(!bhandled){ - throw_context.restore(); // restoring exception stack trace creared by try_context.restore() + r.exception_trace.set_range(trace_bottom, trace_top); rethrow; } + r.exception_trace.set_range(trace_start, trace_start); } return result; @@ -646,7 +656,7 @@ static void locked_process_and_cache_put } else throw Exception(PARSER_RUNTIME, result.exception_should_be_handled, - "$" EXCEPTION_VAR_NAME "." EXCEPTION_HANDLED_PART_NAME " value must be " + "$" EXCEPTION_VAR_NAME ".handled value must be " "either boolean or string '" CACHE_EXCEPTION_HANDLED_CACHE_NAME "'"); } else info.processed_code=&((Value &)result.processed_code).as_string(); @@ -832,8 +842,12 @@ static void _try_operator(Request& r, Me } catch(...){ // process finally code but ignore the result if(finally_code){ + size_t trace_bottom=r.exception_trace.bottom_index(); + size_t trace_top=r.exception_trace.top_index(); + r.exception_trace.set_bottom_index(trace_top); Temp_skip temp(r); /* Value &finally_result= */ r.process(*finally_code); + r.exception_trace.set_range(trace_bottom, trace_top); } rethrow; } @@ -858,13 +872,13 @@ static void _throw_operator(Request&, Me if(params.count()==1 && !params[0].is_string()) { if(HashStringValue *hash=params[0].get_hash()) { const char* type=0; - if(Value* value=hash->get(exception_type_part_name)) + if(Value* value=hash->get(Symbols::TYPE_SYMBOL)) type=value->as_string().cstr(); const String* source=0; - if(Value* value=hash->get(exception_source_part_name)) + if(Value* value=hash->get(Symbols::SOURCE_SYMBOL)) source=&value->as_string(); const char* comment=0; - if(Value* value=hash->get(exception_comment_part_name)) + if(Value* value=hash->get(Symbols::COMMENT_SYMBOL)) comment=value->as_string().cstr(); throw Exception(type, source, "%s", comment); // to avoid MAX_STRING limit @@ -884,6 +898,18 @@ static void _sleep_operator(Request& r, pa_sleep((int)trunc(seconds), (int)trunc((seconds-trunc(seconds))*1000000)); } +static void _a_operator(Request& r, MethodParams& params) { + VArray& result=*new VArray; + ArrayValue& array=result.array(); + + int count=params.count(); + for(int i=0; i2 ? log_level(params.as_string(2, "level must be string")) : LOG_INFO; openlog(*ident ? ident : "parser3", LOG_PID, LOG_USER); syslog(level, "%s", message); closelog(); + (void)r; #else SAPI::log(r.sapi_info, "syslog: %s", message); #endif @@ -1000,6 +1027,9 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL add_native_method("sleep", Method::CT_ANY, _sleep_operator, 1, 1); + // equivalent to ^array::create[...] + add_native_method("A", Method::CT_ANY, _a_operator, 0, 10000, Method::CO_WITHOUT_FRAME); + // ^syslog[ident;message[;info|warning|error|debug]] add_native_method("syslog", Method::CT_ANY, _syslog_operator, 2, 3); }