--- parser3/src/include/pa_request.h 2016/09/29 18:55:43 1.228 +++ parser3/src/include/pa_request.h 2016/11/03 16:17:37 1.239 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.228 2016/09/29 18:55:43 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.239 2016/11/03 16:17:37 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -21,7 +21,6 @@ // consts -const uint ANTI_ENDLESS_EXECUTE_RECOURSION=1000; const size_t pseudo_file_no__process=1; // forwards @@ -36,6 +35,9 @@ class VCookie; class VStateless_class; class VConsole; +extern int pa_execute_recoursion_limit; +extern int pa_loop_limit; + /// Main workhorse. class Request: public PA_Object { friend class Temp_lang; @@ -120,9 +122,7 @@ private: /// list of all used files, Operation::file_no = index to it Array file_list; - /** endless execute(execute(... preventing counter - @see ANTI_ENDLESS_EXECUTE_RECOURSION - */ + /// endless execute(execute(... preventing counter uint anti_endless_execute_recoursion; ///@} @@ -186,24 +186,44 @@ public: /** core request processing - BEWARE: may throw exception to you: catch it! */ - void core( - const char* config_filespec, ///< system config filespec - bool config_fail_on_read_problem, ///< fail if system config file not found - bool header_only); + void core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only); /// executes ops void execute(ArrayOperation& ops); // execute.C - void op_call(VMethodFrame &frame); - void op_call_write(VMethodFrame &frame); + + template void call(Frame& frame){ + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=method_frame=&frame; + + frame.call(*this); + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + } + + template void call_write(Frame& frame){ + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + + rcontext=method_frame=&frame; + + frame.call(*this); + + rcontext=saved_rcontext; + method_frame=saved_method_frame; + } + Value& construct(VStateless_class &class_value, const Method &method); /// execute ops with anti-recoursion check - void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) { - // anti_endless_execute_recoursion - if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { + void recoursion_checked_execute(ArrayOperation& ops) { + if(++anti_endless_execute_recoursion==pa_execute_recoursion_limit) { anti_endless_execute_recoursion=0; // give @exception a chance throw Exception(PARSER_RUNTIME, 0, "call canceled - endless recursion detected"); } @@ -223,53 +243,30 @@ public: /// processes any code-junction there may be inside of @a value Value& process_getter(Junction& junction); // execute.C - Value& process(Value& input_value, bool intercept_string=true); // execute.C + Value& process(Value& input_value); // execute.C void process_write(Value& input_value); // execute.C //@{ convinient helpers const String& process_to_string(Value& input_value) { - return process(input_value, true/*intercept_string*/).as_string(); - } - Value& process_to_value(Value& input_value, bool intercept_string=true) { - return process(input_value, intercept_string); + return process(input_value).as_string(); } //@} const String* get_method_filename(const Method* method); // execute.C const String* get_used_filename(uint file_no); - /// appending, sure of clean string inside - void write_no_lang(const String& astring) { - wcontext->write(astring, - (String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) )); - } - /// appending sure value, that would be converted to clean string - void write_no_lang(Value& avalue) { - if(wcontext->get_in_expression()) - wcontext->write(avalue); - else - wcontext->write(avalue, (String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) )); - } - - /// appending string, passing language built into string being written - void write_pass_lang(const String& astring) { - wcontext->write(astring, String::L_PASS_APPENDED); - } - /// appending possible string, passing language built into string being written - void write_pass_lang(Value& avalue) { - wcontext->write(avalue, String::L_PASS_APPENDED); - } - - /// appending possible string, assigning untaint language - void write_assign_lang(Value& avalue) { - wcontext->write(avalue, flang); + /// appending string with it's languages + inline void write(const String& astring) { + wcontext->write(astring); } - /// appending string, assigning untaint language - void write_assign_lang(const String& astring) { - wcontext->write(astring, flang); + + /// in [] and {} appending string if get_string is not null, else appending value + /// in () allways appending value + inline void write(Value& avalue) { + wcontext->write_as_string(avalue); } - /// appending sure value - void write_value(Value& avalue) { + /// allways appending value + inline void write_value(Value& avalue) { wcontext->write(avalue); } @@ -341,9 +338,6 @@ public: // status read methods /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); - /// executes parser method, use op_call(frame) to execute native method - void execute_method(VMethodFrame& aframe); - //{ 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); @@ -466,20 +460,6 @@ public: } }; -/// Auto-object used for temporary changing Request::flang. -class Temp_lang { - Request& frequest; - String::Language saved_lang; -public: - Temp_lang(Request& arequest, String::Language alang) : - frequest(arequest), - saved_lang(arequest.set_lang(alang)) { - } - ~Temp_lang() { - frequest.restore_lang(saved_lang); - } -}; - /// Auto-object used for temporary changing Request::fconnection. class Temp_connection { Request& frequest;