--- parser3/src/include/pa_request.h 2017/01/13 13:50:28 1.245 +++ parser3/src/include/pa_request.h 2017/02/07 22:00:35 1.249 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 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.245 2017/01/13 13:50:28 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.249 2017/02/07 22:00:35 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -258,6 +258,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); @@ -298,7 +299,7 @@ public: Skip get_skip() { return fskip; } void set_skip(Skip askip) { fskip=askip; } - void set_skip_return() { fskip=SKIP_RETURN; freturn_method_frame=method_frame; } + 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; } @@ -398,17 +399,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) {