--- parser3/src/classes/op.C 2020/02/18 15:40:29 1.254 +++ parser3/src/classes/op.C 2024/10/02 22:54:02 1.264 @@ -1,8 +1,8 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2017 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,7 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.254 2020/02/18 15:40:29 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.264 2024/10/02 22:54:02 moko Exp $"; // defines @@ -200,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 @@ -281,8 +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); - 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)) { @@ -292,14 +293,19 @@ 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(key == "origin") { + if(key == "main") { valid_options++; - use_origin=&value->as_string(); + load_auto_p=r.process(*value).as_bool(); } if(valid_options!=options->count()) @@ -313,7 +319,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(vfile.as_string(), use_origin, load_auto_p); } static void set_skip(Request& r, Request::Skip askip) { @@ -333,7 +339,7 @@ static void _continue(Request& r, Method static void _return(Request& r, MethodParams& params) { VMethodFrame& caller=*r.get_method_frame()->caller(); if(params.count()) - r.put_element(caller, Symbols::RESULT_SYMBOL, ¶ms[0]); + r.put_element(caller, Symbols::RESULT_SYMBOL, &r.process(params[0])); r.set_skip_return(caller); } @@ -395,7 +401,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); @@ -723,8 +729,8 @@ static Cache_get_result cache_get(Reques 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) { @@ -855,7 +861,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) { @@ -871,26 +876,22 @@ 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) && !defined(_WIN64) # define PA_BPT