--- parser3/src/classes/op.C 2016/11/29 15:28:05 1.248 +++ parser3/src/classes/op.C 2026/09/26 19:06:55 1.285 @@ -1,8 +1,8 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" @@ -17,8 +17,13 @@ #include "pa_vmethod_frame.h" #include "pa_vclass.h" #include "pa_charset.h" +#include "pa_varray.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.248 2016/11/29 15:28:05 moko Exp $"; +#ifdef HAVE_SYSLOG +#include "syslog.h" +#endif + +volatile const char * IDENT_OP_C="$Id: op.C,v 1.285 2026/09/26 19:06:55 moko Exp $"; // defines @@ -76,7 +81,15 @@ public: ULN("json", JSON); #undef ULN } -} untaint_lang_name2enum; + + static Untaint_lang_name2enum &instance(){ + static Untaint_lang_name2enum *singleton=NULL; + if(!singleton) + singleton=new Untaint_lang_name2enum; + return *singleton; + } + +}; // methods @@ -97,7 +110,7 @@ static void _if(Request& r, MethodParams } String::Language get_untaint_lang(const String& lang_name){ - String::Language lang=untaint_lang_name2enum.get(lang_name); + String::Language lang=Untaint_lang_name2enum::instance().get(lang_name); if(!lang) throw Exception(PARSER_RUNTIME, &lang_name, "invalid taint language"); return lang; @@ -174,33 +187,23 @@ static void _process(Request& r, MethodP size_t options_index=index+1; if(options_indexas_string(); } else if(key == "file") { - valid_options++; file_alias=&value->as_string(); } else if(key == "lineno") { - valid_options++; line_no_alias_offset=value->as_int(); } else if(key == "replace") { - valid_options++; allow_class_replace=r.process(*value).as_bool(); - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - uint processe_file_no=file_alias ? r.register_file(r.absolute(*file_alias)) : pseudo_file_no__process; + uint processe_file_no=file_alias ? r.register_file(r.full_disk_path(*file_alias)) : pseudo_file_no__process; // process...{string} Value& vjunction=params.as_junction(index, "body must be code"); // evaluate source to process @@ -248,7 +251,7 @@ static void _while(Request& r, MethodPar break; Value& sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + TempSkip4Delimiter skip(r); const String* s_processed=sv_processed.get_string(); if(s_processed && !s_processed->is_empty()) { // we have body @@ -259,7 +262,7 @@ static void _while(Request& r, MethodPar } r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -271,39 +274,32 @@ static void _while(Request& r, MethodPar break; r.process_write(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - if(lskip==Request::SKIP_BREAK) + if(r.check_skip_break()) break; } } } static void _use(Request& r, MethodParams& params) { - Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE); + const String& file_name=params.as_file_name(0); - bool allow_class_replace=false; const String* use_origin=0; + bool allow_class_replace=false; + bool load_auto_p=false; if(params.count()==2) if(HashStringValue* options=params.as_hash(1)) { - int valid_options=0; for(HashStringValue::Iterator i(*options); i; i.next() ){ - String::Body key=i.key(); Value* value=i.value(); - - if(key == "replace") { - valid_options++; - allow_class_replace=r.process(*value).as_bool(); - } - if(key == "origin") { - valid_options++; use_origin=&value->as_string(); - } - - if(valid_options!=options->count()) + } else if(key == "replace") { + allow_class_replace=r.process(*value).as_bool(); + } else if(key == "main") { + load_auto_p=r.process(*value).as_bool(); + } else throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } } @@ -314,7 +310,7 @@ static void _use(Request& r, MethodParam Temp_class_replace class_replace(r, allow_class_replace); - r.use_file(r.main_class, vfile.as_string(), use_origin); + r.use_file(file_name, use_origin, load_auto_p); } static void set_skip(Request& r, Request::Skip askip) { @@ -331,6 +327,13 @@ static void _continue(Request& r, Method if(!params.count() || params.as_bool(0, "condition must be expression", r)) set_skip(r, Request::SKIP_CONTINUE); } +static void _return(Request& r, MethodParams& params) { + VMethodFrame& caller=*r.get_method_frame()->caller(); + if(params.count()) + r.put_element(caller, Symbols::RESULT_SYMBOL, &r.process(params[0])); + r.set_skip_return(caller); +} + static void _for(Request& r, MethodParams& params) { InCycle temp(r); @@ -354,7 +357,7 @@ static void _for(Request& r, MethodParam vint->set_int(i); Value& sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + TempSkip4Delimiter skip(r); const String* s_processed=sv_processed.get_string(); if(s_processed && !s_processed->is_empty()) { // we have body @@ -365,7 +368,7 @@ static void _for(Request& r, MethodParam } r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -373,9 +376,8 @@ static void _for(Request& r, MethodParam vint->set_int(i); r.process_write(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - if(lskip==Request::SKIP_BREAK) + if(r.check_skip_break()) break; } } @@ -390,7 +392,7 @@ static void _eval(Request& r, MethodPara if(fmt.is_empty()){ r.write(value_result); } else { - r.write(String(format(value_result.as_double(), fmt.cstrm()))); + r.write(String(format_double(value_result.as_double(), fmt.cstrm()))); } } else r.write(value_result); @@ -535,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; @@ -543,38 +544,54 @@ 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 Recursion_limit_exception&) { + rethrow; } 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 + r.recursion_limit_try_restore(); // here to allow "endless" recursion in catch - { - 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(...) { + try_context.restore(); // restore execution for finally, but keep new error trace. + r.recursion_limit_try_restore(); // here to allow "endless" recursion in finally + details.expire_trace(); + rethrow; } + details.expire_trace(); 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; @@ -645,7 +662,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(); @@ -661,7 +678,8 @@ static void locked_process_and_cache_put prolog.expires=info.scope->expires; // buffer -write> file - write(f, serialized.str, serialized.length); + if(write(f, serialized.str, serialized.length)<0) + throw Exception("file.write", 0, "write failed: %s (%d)", strerror(errno), errno); } else // expired! info.scope->expires=0; // flag it so that could be easily checked by caller } @@ -696,23 +714,16 @@ struct Cache_get_result { }; #endif -static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) { +static Cache_get_result cache_get(const String& file_spec, time_t now) { Cache_get_result result={0, false}; - File_read_result file=file_read(charsets, file_spec, - false/*as_text*/, - 0, //no params - false/*fail_on_read_problem*/); - if(file.success && file.length/* ignore reads which are empty due to - non-unary open+lockEX conflict with lockSH */) { - - Data_string_serialized_prolog& prolog= - *reinterpret_cast(file.str); - + File_read_result file=file_read_binary(file_spec, false /*fail_on_read_problem*/); + if(file.success && file.length /*ignore reads which are empty due to non-unary open+lockEX conflict with lockSH*/) { + + Data_string_serialized_prolog& prolog = *reinterpret_cast(file.str); + String* body=new String; - if( - file.length>=sizeof(Data_string_serialized_prolog) - && prolog.version==DATA_STRING_SERIALIZED_VERSION) { + if(file.length>=sizeof(Data_string_serialized_prolog) && prolog.version==DATA_STRING_SERIALIZED_VERSION) { if(body->deserialize(sizeof(Data_string_serialized_prolog), file.str, file.length)) { result.body=body; result.expired=prolog.expires <= now; @@ -722,11 +733,11 @@ static Cache_get_result cache_get(Reques return result; } -static time_t as_expires(Request& r, MethodParams& params, - int index, time_t now) { + +static time_t as_expires(Request& r, MethodParams& params, int index, time_t now) { time_t result; - if(Value* vdate=params[index].as(VDATE_TYPE)) - result=(time_t)(static_cast(vdate)->get_time()); + if(VDate* vdate=dynamic_cast(¶ms[index])) + result=(time_t)vdate->get_time(); else result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); @@ -734,7 +745,7 @@ static time_t as_expires(Request& r, Met } static const String& as_file_spec(Request& r, MethodParams& params, int index) { - return r.absolute(params.as_string(index, "filespec must be string")); + return r.full_disk_path(params.as_string(index, "filespec must be string")); } static void _cache(Request& r, MethodParams& params) { @@ -785,7 +796,7 @@ static void _cache(Request& r, MethodPar catch_code=¶ms.as_junction(3, "catch_code must be code"); if(scope.expires>now) { - Cache_get_result cached=cache_get(r.charsets, file_spec, now); + Cache_get_result cached=cache_get(file_spec, now); if(cached.body) { // have cached copy if(cached.expired) { @@ -834,11 +845,17 @@ 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&) { + rethrow; } 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; } @@ -857,44 +874,79 @@ static void _try_operator(Request& r, Me // no exception in try/catch, writing processed body_code or catch_code r.write(result.processed_code); } - } static void _throw_operator(Request&, MethodParams& params) { 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?source:0, - "%s", comment?comment:""); + throw Exception(type, source, "%s", comment); // to avoid MAX_STRING limit } else - throw Exception(PARSER_RUNTIME, - 0, - "one-param version has hash or string param"); + throw Exception(PARSER_RUNTIME, 0, "one-param version has hash or string param"); } else { const char* type=params.as_string(0, "type must be string").cstr(); - const String* source=params.count()>1? ¶ms.as_string(1, "source must be string"):0; - const char* comment=params.count()>2? params.as_string(2, "comment must be string").cstr():0; - throw Exception(type, source, "%s", comment?comment:""); + const String* source=params.count()>1 ? ¶ms.as_string(1, "source must be string") : 0; + const char* comment=params.count()>2 ? params.as_string(2, "comment must be string").cstr() : 0; + throw Exception(type, source, "%s", comment); // to avoid MAX_STRING limit } - } +} 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)); - } +} + +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 +} -#if defined(WIN32) && defined(_DEBUG) +#if defined(WIN32) && defined(_DEBUG) && !defined(_WIN64) # define PA_BPT static void _bpt(Request&, MethodParams&) { _asm int 3; @@ -945,6 +997,10 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL // ^continue(condition) add_native_method("continue", Method::CT_ANY, _continue, 0, 1, Method::CO_WITHOUT_FRAME); + // ^return[] + // ^return[result] + add_native_method("return", Method::CT_ANY, _return, 0, 1); + // ^for[i](from-number;to-number-inclusive){code}[delim] add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); @@ -978,6 +1034,12 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3); 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); } // constructor & configurator