--- parser3/src/include/pa_request.h 2016/09/29 18:55:43 1.228 +++ parser3/src/include/pa_request.h 2016/10/05 18:41:54 1.232 @@ -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.232 2016/10/05 18:41:54 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,13 +186,9 @@ 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 @@ -201,9 +197,8 @@ public: 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,15 +218,12 @@ 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