--- parser3/src/classes/op.C 2016/11/01 23:10:40 1.243 +++ parser3/src/classes/op.C 2024/12/23 16:59:17 1.271 @@ -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-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" @@ -18,7 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.243 2016/11/01 23:10:40 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.271 2024/12/23 16:59:17 moko Exp $"; // defines @@ -76,7 +76,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 +105,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; @@ -200,7 +208,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 @@ -216,10 +224,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.call(frame); - r.write(frame.result()); + METHOD_FRAME_ACTION(*main_method, r.get_method_frame()->caller(), *target_self, { + frame.empty_params(); + r.call(frame); + r.write(frame.result()); + }); } } @@ -247,7 +256,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 @@ -258,7 +267,7 @@ static void _while(Request& r, MethodPar } r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -270,18 +279,19 @@ 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); + 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)) { @@ -291,20 +301,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(*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(file_name, use_origin, load_auto_p); } static void set_skip(Request& r, Request::Skip askip) { @@ -321,6 +344,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); @@ -344,7 +374,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 @@ -355,7 +385,7 @@ static void _for(Request& r, MethodParam } r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -363,9 +393,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; } } @@ -380,7 +409,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); @@ -451,7 +480,7 @@ static void _switch(Request& r, MethodPa // because of stacked WWrapper used there as wcontext r.process(cases_code); if(Value* selected_code=data->found? data->found: data->_default) - r.write(r.process(*selected_code)); + r.process_write(*selected_code); } static void _case(Request& r, MethodParams& params) { @@ -686,23 +715,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; @@ -712,11 +734,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); @@ -724,7 +746,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) { @@ -775,7 +797,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) { @@ -828,7 +850,7 @@ static void _try_operator(Request& r, Me // process finally code but ignore the result if(finally_code){ Temp_skip temp(r); - Value &finally_result=r.process(*finally_code); + /* Value &finally_result= */ r.process(*finally_code); } rethrow; } @@ -847,7 +869,6 @@ 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) { @@ -863,28 +884,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; @@ -935,6 +952,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);