--- parser3/src/include/pa_request.h 2016/11/29 14:32:32 1.243 +++ parser3/src/include/pa_request.h 2020/12/15 17:10:31 1.258 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.243 2016/11/29 14:32:32 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.258 2020/12/15 17:10:31 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -19,6 +19,26 @@ #include "pa_request_charsets.h" #include "pa_sapi.h" +// defines for externs + +#define EXCEPTION_HANDLED_PART_NAME "handled" + + +// externs + +extern const String main_method_name; +extern const String auto_method_name; + +extern const String exception_type_part_name; +extern const String exception_source_part_name; +extern const String exception_comment_part_name; +extern const String exception_handled_part_name; + +// defines for statics + +#define MAIN_CLASS_NAME "MAIN" +#define AUTO_FILE_NAME "auto.p" + // consts const size_t pseudo_file_no__process=1; @@ -35,8 +55,10 @@ class VCookie; class VStateless_class; class VConsole; -extern int pa_execute_recoursion_limit; extern int pa_loop_limit; +extern int pa_execute_recoursion_limit; +extern int pa_httpd_timeout; +extern size_t pa_file_size_limit; /// Main workhorse. class Request: public PA_Object { @@ -64,8 +86,10 @@ public: enum Skip { SKIP_NOTHING, + SKIP_CONTINUE, SKIP_BREAK, - SKIP_CONTINUE + SKIP_RETURN, + SKIP_INTERRUPTED }; private: @@ -86,8 +110,6 @@ private: ArrayOperation& ops() const { return *fops; } VMethodFrame& method_frame() const { return *fmethod_frame; } - /// needed to fill unused Array entries - StackItem() {} StackItem(Value& avalue): fvalue(&avalue) {} StackItem(ArrayOperation& aops): fops(&aops) {} StackItem(VMethodFrame& amethod_frame): fmethod_frame(&amethod_frame) {} @@ -146,10 +168,12 @@ public: /// current connection SQL_Connection* fconnection; //@} - /// interrupted flag, raised on signals [SIGPIPE] - bool finterrupted; - Skip fskip; + +private: + int fin_cycle; + Skip fskip; + VMethodFrame* freturn_method_frame; public: uint register_file(String::Body file_spec); @@ -188,7 +212,7 @@ public: core request processing BEWARE: may throw exception to you: catch it! */ - void core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only); + void core(const char* config_filespec, bool header_only, const String& amain_method_name = main_method_name); /// executes ops void execute(ArrayOperation& ops); // execute.C @@ -232,10 +256,10 @@ public: } /// - void use_file_directly(VStateless_class& aclass, const String& file_spec, bool fail_on_read_problem=true, bool fail_on_file_absence=true); + void use_file_directly(const String& file_spec, bool fail_on_file_absence=true, bool with_auto_p=false); - /// compiles the file, maybe forcing it's class @a name and @a base_class. - void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec); + /// compiles the file in main class context by default + void use_file(const String& file_name, const String* use_filespec, bool with_auto_p=false); /// for @USE only, calls ^use (which may be user-defined) void use_file(const String& file_name, const String* use_filespec, Operation::Origin origin); @@ -253,6 +277,7 @@ public: return process(input_value).as_string(); } //@} + const Operation::Origin get_method_origin(const Method* method); // execute.C const String* get_method_filespec(const Method* method); // execute.C const String* get_used_filespec(uint file_no); @@ -275,8 +300,7 @@ public: /// returns relative to @a path path to @a file const String& relative(const char* apath, const String& relative_name); - /// returns an absolute @a path to relative @a name - const String& absolute(const String& relative_name); + const String& full_disk_path(const String& relative_name); /// returns the mime type of 'user_file_name' const String& mime_type_of(const String* file_name); @@ -291,11 +315,11 @@ public: return fconnection; } - void set_interrupted(bool ainterrupted) { finterrupted=ainterrupted; } - bool get_interrupted() { return finterrupted; } - - void set_skip(Skip askip) { fskip=askip; } Skip get_skip() { return fskip; } + void set_skip(Skip askip) { fskip=askip; } + void set_skip_return(VMethodFrame& amethod_frame) { fskip=SKIP_RETURN; freturn_method_frame=&amethod_frame; } + inline bool check_skip_break() { bool result=fskip >= SKIP_BREAK; if(fskip <= SKIP_BREAK) fskip=SKIP_NOTHING; return result; } + inline void check_skip_return() { if(fskip==SKIP_RETURN && method_frame==freturn_method_frame) fskip=SKIP_NOTHING; } void set_in_cycle(int adelta) { fin_cycle+=adelta; } bool get_in_cycle() { return fin_cycle>0; } @@ -337,19 +361,12 @@ public: // status read methods /// public for ^reflection:copy[] void put_element(Value& ncontext, const String& name, Value* value); - /// for @main[] - const String* execute_virtual_method(Value& aself, const String& method_name); + /// for @main[] and parser://method/call + const String* execute_method(VStateless_class& aclass, const String& method_name, Value* optional_param = 0); - //{ for @conf[filespec] and @auto[filespec] and parser://method/call - const String* execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string); - - struct Execute_nonvirtual_method_result { - const String* string; - Method* method; - Execute_nonvirtual_method_result(): string(0), method(0) {} - }; + //{ for @conf[filespec] and @auto[filespec] + bool execute_method_if_exists(VStateless_class& aclass, const String& method_name, Value* optional_param); - Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, const String& method_name, VString* optional_param, bool do_return_string); //} #ifdef XML @@ -393,17 +410,6 @@ private: // mime types /// $MAIN:MIME-TYPES Table *mime_types; -private: // lang manipulation - - String::Language set_lang(String::Language alang) { - String::Language result=flang; - flang=alang; - return result; - } - void restore_lang(String::Language alang) { - flang=alang; - } - private: // connection manipulation SQL_Connection* set_connection(SQL_Connection* aconnection) { @@ -488,6 +494,23 @@ public: } }; +/// Auto-object used for break out of cycle check +class TempSkip4Delimiter { + Request& frequest; + Request::Skip fskip; +public: + TempSkip4Delimiter(Request& arequest) : frequest(arequest), fskip(arequest.get_skip()) { + frequest.set_skip(Request::SKIP_NOTHING); + } + // returns true if break required, should be called + bool check_break() { + if(frequest.get_skip()) + fskip=frequest.get_skip(); + frequest.set_skip(fskip <= Request::SKIP_BREAK ? Request::SKIP_NOTHING : fskip); + return fskip >= Request::SKIP_BREAK; + } +}; + /// Auto-object used for temporary changing Request::allow_class_replace. class Temp_class_replace { Request& frequest; @@ -511,24 +534,4 @@ public: ~Temp_value_element(); }; -// defines for externs - -#define EXCEPTION_HANDLED_PART_NAME "handled" - - -// externs - -extern const String main_method_name; -extern const String auto_method_name; - -extern const String exception_type_part_name; -extern const String exception_source_part_name; -extern const String exception_comment_part_name; -extern const String exception_handled_part_name; - -// defines for statics - -#define MAIN_CLASS_NAME "MAIN" -#define AUTO_FILE_NAME "auto.p" - #endif