--- parser3/src/classes/op.C 2016/09/20 09:55:02 1.232 +++ parser3/src/classes/op.C 2024/09/13 04:01:22 1.263 @@ -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-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" @@ -18,11 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.232 2016/09/20 09:55:02 moko Exp $"; - -// limits - -#define MAX_LOOPS 20000 +volatile const char * IDENT_OP_C="$Id: op.C,v 1.263 2024/09/13 04:01:22 moko Exp $"; // defines @@ -90,14 +86,14 @@ static void _if(Request& r, MethodParams do { bool condition=params.as_bool(i, "condition must be expression", r); if(condition) { - r.process_write(*params.get(i+1)); + r.process_write(params[i+1]); return; } i+=2; } while (i < max_param); if(i == max_param) - r.process_write(*params.get(i)); + r.process_write(params[i]); } String::Language get_untaint_lang(const String& lang_name){ @@ -110,17 +106,19 @@ String::Language get_untaint_lang(const static void _untaint(Request& r, MethodParams& params) { String::Language lang; if(params.count()==1) - lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql + lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql else lang=get_untaint_lang(params.as_string(0, "lang must be string")); - { - Value& vbody=params.as_junction(params.count()-1, "body must be code"); - - Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - StringOrValue result=r.process(vbody); // process marking tainted with that lang - r.write_assign_lang(result); - } + Value& vbody=params.as_junction(params.count()-1, "body must be code"); + Value& result=r.process(vbody); + + if(const String* string=result.get_string()){ + String &untainted=*new String(); + string->append_to(untainted, lang); // mark all tainted to specified language + r.write(untainted); + } else + r.write(result); // this is not normal, just backward compatibility } static void _taint(Request& r, MethodParams& params) { @@ -134,7 +132,7 @@ static void _taint(Request& r, MethodPar Value& vbody=params.as_no_junction(params.count()-1, "body must not be code"); String result(vbody.as_string(), lang); // force result language to specified - r.write_assign_lang(result); + r.write(result); } } @@ -142,7 +140,7 @@ static void _apply_taint(Request& r, Met String::Language lang=params.count()==1 ? String::L_AS_IS : get_untaint_lang(params.as_string(0, "lang must be string")); const String &sbody=params.as_string(params.count()-1, "body must be string"); String::Body result_body=sbody.cstr_to_string_body_untaint(lang, r.connection(false), &r.charsets); - r.write_pass_lang(*new String(result_body, String::L_AS_IS)); + r.write(*new String(result_body, String::L_AS_IS)); } static void _process(Request& r, MethodParams& params) { @@ -154,7 +152,10 @@ static void _process(Request& r, MethodP if(maybe_target_self.get_string() || maybe_target_self.get_junction()) target_self=&r.get_method_frame()->caller()->self(); else { - target_self=&maybe_target_self; index++; + target_self=&maybe_target_self; + if(params.count()==1) + throw Exception(PARSER_RUNTIME, 0, "no body specified"); + index++; } { @@ -162,8 +163,6 @@ static void _process(Request& r, MethodP if(!target_class) throw Exception(PARSER_RUNTIME, 0, "no target class"); - // temporary remove language change - Temp_lang temp_lang(r, String::L_PARSER_CODE); // temporary zero @main so to maybe-replace it in processed code Temp_method temp_method_main(*target_class, main_method_name, 0); @@ -193,7 +192,7 @@ static void _process(Request& r, MethodP line_no_alias_offset=value->as_int(); } else if(key == "replace") { valid_options++; - allow_class_replace=r.process_to_value(*value).as_bool(); + allow_class_replace=r.process(*value).as_bool(); } } @@ -201,7 +200,7 @@ static void _process(Request& r, MethodP 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 @@ -209,7 +208,7 @@ static void _process(Request& r, MethodP Temp_class_replace class_replace(r, allow_class_replace); - r.use_buf(*target_class, source.untaint_cstr(String::L_AS_IS, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset); + r.use_buf(*target_class, source.untaint_cstr(String::L_PARSER_CODE, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset); // main_method main_method=target_class->get_method(main_method_name); @@ -217,10 +216,11 @@ static void _process(Request& r, MethodP // after restoring current-request-lang // maybe-execute @main[] if(main_method) { - VMethodFrame frame(*main_method, r.get_method_frame()->caller(), *target_self); - frame.empty_params(); - r.op_call(frame); - r.write_pass_lang(frame.result()); + METHOD_FRAME_ACTION(*main_method, r.get_method_frame()->caller(), *target_self, { + frame.empty_params(); + r.call(frame); + r.write(frame.result()); + }); } } @@ -241,43 +241,38 @@ static void _while(Request& r, MethodPar if(delim_maybe_code){ // delimiter set bool need_delim=false; while(true) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(++endless_loop_count>=pa_loop_limit) // endless loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); - if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + if(!r.process(vcondition).as_bool()) break; - StringOrValue sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + Value& sv_processed=r.process(body_code); + TempSkip4Delimiter skip(r); const String* s_processed=sv_processed.get_string(); if(s_processed && !s_processed->is_empty()) { // we have body if(need_delim) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); + r.write(r.process(*delim_maybe_code)); else need_delim=true; } - r.write_pass_lang(sv_processed); + r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { while(true) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(++endless_loop_count>=pa_loop_limit) // endless loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); - if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + if(!r.process(vcondition).as_bool()) 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; } } @@ -286,7 +281,9 @@ static void _while(Request& r, MethodPar static void _use(Request& r, MethodParams& params) { Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE); + 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)) { @@ -296,20 +293,33 @@ static void _use(Request& r, MethodParam String::Body key=i.key(); Value* value=i.value(); + if(key == "origin") { + valid_options++; + use_origin=&value->as_string(); + } + if(key == "replace") { valid_options++; - allow_class_replace=r.process_to_value(*value).as_bool(); + allow_class_replace=r.process(*value).as_bool(); } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + if(key == "main") { + valid_options++; + load_auto_p=r.process(*value).as_bool(); + } + + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } } + if(!use_origin) + if(VMethodFrame* caller=r.get_method_frame()->caller()) + use_origin=r.get_method_filespec(&caller->method); + Temp_class_replace class_replace(r, allow_class_replace); - // _use could be called from the parser3 method only, so caller is always defined - r.use_file(r.main_class, vfile.as_string(), r.get_method_filename(&r.get_method_frame()->caller()->method)); + r.use_file(vfile.as_string(), use_origin, load_auto_p); } static void set_skip(Request& r, Request::Skip askip) { @@ -326,6 +336,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); @@ -335,10 +352,8 @@ static void _for(Request& r, MethodParam Value& body_code=params.as_junction(3, "body must be code"); Value* delim_maybe_code=params.count()>4?¶ms[4]:0; - if(to-from>=MAX_LOOPS) // too long loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(to-from>=pa_loop_limit) // too long loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); VInt* vint=new VInt(0); @@ -350,19 +365,19 @@ static void _for(Request& r, MethodParam for(int i=from; i<=to; i++) { vint->set_int(i); - StringOrValue sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + Value& sv_processed=r.process(body_code); + TempSkip4Delimiter skip(r); const String* s_processed=sv_processed.get_string(); if(s_processed && !s_processed->is_empty()) { // we have body if(need_delim) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); + r.write(r.process(*delim_maybe_code)); else need_delim=true; } - r.write_pass_lang(sv_processed); + r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -370,9 +385,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; } } @@ -381,17 +395,16 @@ static void _for(Request& r, MethodParam static void _eval(Request& r, MethodParams& params) { Value& expr=params.as_junction(0, "need expression"); // evaluate expresion - Value& value_result=r.process_to_value(expr, - false/*don't intercept string*/).as_expr_result(); + Value& value_result=r.process(expr).as_expr_result(); if(params.count()>1) { const String& fmt=params.as_string(1, "fmt must be string").trim(); if(fmt.is_empty()){ - r.write_no_lang(value_result); + r.write(value_result); } else { - r.write_no_lang(String(format(value_result.as_double(), fmt.cstrm()))); + r.write(String(format(value_result.as_double(), fmt.cstrm()))); } } else - r.write_no_lang(value_result); + r.write(value_result); } static void _connect(Request& r, MethodParams& params) { @@ -451,15 +464,15 @@ public: }; #endif static void _switch(Request& r, MethodParams& params) { - Switch_data* data=new Switch_data(r, r.process_to_value(params[0])); + Switch_data* data=new Switch_data(r, r.process(params[0])); Temp_hash_value, void*> switch_data_setter(&r.classes_conf, switch_data_name, data); Value& cases_code=params.as_junction(1, "switch cases must be code"); // execution of found ^case[...]{code} must be in context of ^switch[...]{code} // because of stacked WWrapper used there as wcontext - r.process(cases_code, true/*intercept_string*/); + r.process(cases_code); if(Value* selected_code=data->found? data->found: data->_default) - r.write_pass_lang(r.process(*selected_code)); + r.process_write(*selected_code); } static void _case(Request& r, MethodParams& params) { @@ -484,7 +497,7 @@ static void _case(Request& r, MethodPara #endif for(int i=0; i_default=code; @@ -507,7 +520,7 @@ static void _case(Request& r, MethodPara } #ifndef DOXYGEN struct Try_catch_result { - StringOrValue processed_code; + ValueRef processed_code; const String* exception_should_be_handled; Try_catch_result(): exception_should_be_handled(0) {} @@ -530,7 +543,7 @@ public: /// used by ^try and ^cache, @returns $exception.handled[string] if any template -static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) { +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 @@ -578,7 +591,7 @@ static Try_catch_result try_catch(Reques return result; } -static StringOrValue process_try_body_code(Request& r, Value* body_code) { +static Value& process_try_body_code(Request& r, Value* body_code) { return r.process(*body_code); } @@ -618,8 +631,8 @@ struct Locked_process_and_cache_put_acti -static StringOrValue process_cache_body_code(Request& r, Value* body_code) { - return StringOrValue(r.process_to_string(*body_code)); +static Value& process_cache_body_code(Request& r, Value* body_code) { + return r.process(*body_code); } /* @todo maybe network order worth spending some effort? @@ -646,7 +659,7 @@ static void locked_process_and_cache_put "$" EXCEPTION_VAR_NAME "." EXCEPTION_HANDLED_PART_NAME " value must be " "either boolean or string '" CACHE_EXCEPTION_HANDLED_CACHE_NAME "'"); } else - info.processed_code=&result.processed_code.as_string(); + info.processed_code=&((Value &)result.processed_code).as_string(); // expiration time not spoiled by ^cache(0) or something? if(info.scope->expires > time(0)) { @@ -697,20 +710,13 @@ struct Cache_get_result { static Cache_get_result cache_get(Request_charsets& charsets, 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; @@ -720,11 +726,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=vdate->get_time(); else result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); @@ -732,7 +738,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) { @@ -741,7 +747,7 @@ static void _cache(Request& r, MethodPar Cache_scope* scope=static_cast(r.classes_conf.get(cache_data_name)); if(!scope) throw Exception(PARSER_RUNTIME, 0, "expire-time get without cache"); - r.write_no_lang(*new VDate((pa_time_t)scope->expires)); + r.write(*new VDate((pa_time_t)scope->expires)); return; } @@ -790,7 +796,7 @@ static void _cache(Request& r, MethodPar scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[] } else { // and it's not expired yet write it out - r.write_assign_lang(*cached.body); + r.write(*cached.body); // happy with it return; } @@ -802,7 +808,7 @@ static void _cache(Request& r, MethodPar const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec); if(processed_body){ // write it out - r.write_assign_lang(*processed_body); + r.write(*processed_body); // happy with it return; } else { @@ -816,10 +822,9 @@ static void _cache(Request& r, MethodPar // process without caching if(catch_code){ Try_catch_result result=try_catch(r, process_try_body_code, &body_code, catch_code); - r.write_assign_lang(result.processed_code); + r.write(result.processed_code); } else { - const String& processed_body=r.process_to_string(body_code); - r.write_assign_lang(processed_body); + r.write(r.process_to_string(body_code)); } } @@ -829,7 +834,6 @@ static void _try_operator(Request& r, Me Value* finally_code=(params.count()==3) ? ¶ms.as_junction(2, "finally_code must be code") : 0; Try_catch_result result; - StringOrValue finally_result; try{ // process try and catch code @@ -838,7 +842,7 @@ static void _try_operator(Request& r, Me // process finally code but ignore the result if(finally_code){ Temp_skip temp(r); - finally_result=r.process(*finally_code); + /* Value &finally_result= */ r.process(*finally_code); } rethrow; } @@ -846,17 +850,17 @@ static void _try_operator(Request& r, Me // process finally code if(finally_code){ Temp_skip temp(r); - finally_result=r.process(*finally_code); - } - - // no exception in try, catch or finally, writing the result + Value& finally_result=r.process(*finally_code); - // write out processed body_code or catch_code - r.write_pass_lang(result.processed_code); + // no exception in try/catch or finally, writing processed body_code or catch_code + r.write(result.processed_code); - // write out processed finally code - if(finally_code) - r.write_pass_lang(finally_result); + // write out processed finally code + r.write(finally_result); + } else { + // no exception in try/catch, writing processed body_code or catch_code + r.write(result.processed_code); + } } static void _throw_operator(Request&, MethodParams& params) { @@ -872,28 +876,24 @@ static void _throw_operator(Request&, Me if(Value* value=hash->get(exception_comment_part_name)) 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)); - } +} -#if defined(WIN32) && defined(_DEBUG) +#if defined(WIN32) && defined(_DEBUG) && !defined(_WIN64) # define PA_BPT static void _bpt(Request&, MethodParams&) { _asm int 3; @@ -944,8 +944,12 @@ 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, Method::CO_WITHOUT_WCONTEXT); + add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); // ^eval(expr) // ^eval(expr)[format]