--- parser3/src/classes/op.C 2026/10/13 20:02:00 1.286 +++ parser3/src/classes/op.C 2026/10/28 22:01:36 1.290 @@ -23,7 +23,7 @@ #include "syslog.h" #endif -volatile const char * IDENT_OP_C="$Id: op.C,v 1.286 2026/10/13 20:02:00 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.290 2026/10/28 22:01:36 moko Exp $"; // defines @@ -34,6 +34,8 @@ volatile const char * IDENT_OP_C="$Id: o class VClassMAIN: public VClass { public: VClassMAIN(); + /// native methods are copied from the donor + VClassMAIN(VClassMAIN& donor): VClass(MAIN_CLASS_NAME, 0, &donor) {} }; // defines for statics @@ -485,7 +487,8 @@ public: arequest.set_skip(Request::SKIP_NOTHING); } ~Temp_skip() { - if(frequest.get_skip() == Request::SKIP_NOTHING) + // the interruption is not restored: if it is not set now, it is already thrown + if(frequest.get_skip() == Request::SKIP_NOTHING && saved_skip != Request::SKIP_INTERRUPTED) frequest.set_skip(saved_skip); } }; @@ -507,7 +510,7 @@ static Try_catch_result try_catch(Reques try { result.processed_code=body_code(r, info); - } catch(const Recursion_limit_exception&) { + } catch(const Uncatchable_exception&) { rethrow; } catch(const Exception& e) { size_t trace_bottom=r.exception_trace.bottom_index(); @@ -804,7 +807,7 @@ static void _try_operator(Request& r, Me try{ // process try and catch code result=try_catch(r, process_try_body_code, &body_code, &catch_code); - } catch(const Recursion_limit_exception&) { + } catch(const Uncatchable_exception&) { rethrow; } catch(...){ // process finally code but ignore the result @@ -861,8 +864,11 @@ static void _throw_operator(Request&, Me static void _sleep_operator(Request& r, MethodParams& params) { double seconds=params.as_double(0, "seconds must be double", r); - if(seconds>0) - pa_sleep((int)trunc(seconds), (int)trunc((seconds-trunc(seconds))*1000000)); + // sleeping by ticks to notice the interruption + for(double tick; seconds>0 && !r.get_skip(); seconds-=tick){ + tick=seconds<0.1 ? seconds : 0.1; + pa_sleep(0, (unsigned long)(tick*1000000)); + } } static void _a_operator(Request& r, MethodParams& params) { @@ -1004,5 +1010,7 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL // constructor & configurator VStateless_class& VClassMAIN_create() { - return *new VClassMAIN; + // adding native methods from a singleton + static VClassMAIN* prototype=new VClassMAIN; + return *new VClassMAIN(*prototype); }