--- parser3/src/include/pa_request.h 2003/04/02 09:32:11 1.160.2.37.2.15 +++ parser3/src/include/pa_request.h 2003/04/03 11:19:49 1.160.2.37.2.22 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/04/02 09:32:11 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/04/03 11:19:49 $"; #include "pa_hash.h" #include "pa_wcontext.h" @@ -25,6 +25,7 @@ static const char* IDENT_REQUEST_H="$Dat // consts const uint ANTI_ENDLESS_EXECUTE_RECOURSION=1000; +const size_t pseudo_file_no__process=1; // forwards @@ -44,24 +45,27 @@ class Request: public PA_Object { friend class Temp_connection; friend class Request_context_saver; friend class Temp_request_self; + friend class Exception_trace; - ///@{ core data +public: + class Trace { + const String* fname; + Operation::Info forigin; + public: + Trace(): fname(0) {} + void clear() { fname=0; } + operator bool() const { return fname!=0; } - /// classes - HashStringValue fclasses; + Trace(const String* aname, const Operation::Info aorigin): + fname(aname), forigin(aorigin) {} - /// already used files to avoid cyclic uses - Hash used_files; + const String* name() const { return fname; } + const Operation::Info origin() const { return forigin; } + }; - /** endless execute(execute(... preventing counter - @see ANTI_ENDLESS_EXECUTE_RECOURSION - */ - uint anti_endless_execute_recoursion; - - ///@} +private: union StackItem { - private: Value* fvalue; ArrayOperation* fops; VMethodFrame* fmethod_frame; @@ -82,14 +86,50 @@ class Request: public PA_Object { StackItem(VMethodFrame& amethod_frame): fmethod_frame(&amethod_frame) {} }; + class Exception_trace: public Stack { + size_t fbottom; + public: + Exception_trace(): fbottom(0) {} + + size_t bottom_index() { return fbottom; } + element_type bottom_value() { return get(bottom_index()); } + + void clear() { + ftop=fbottom=0; + } + + bool is_empty() { + return ftop==fbottom; + } + + const element_type extract_origin(const String*& problem_source); + }; + + ///@{ core data + + /// classes + HashStringValue fclasses; + + /// already used files to avoid cyclic uses + Hash used_files; + /// list of all used files, Operation::file_no = index to it + Array file_list; + + /** endless execute(execute(... preventing counter + @see ANTI_ENDLESS_EXECUTE_RECOURSION + */ + uint anti_endless_execute_recoursion; + + ///@} + /// execution stack Stack stack; + /// exception stack trace + Exception_trace exception_trace; public: //@{ request processing status - /// exception stack trace - //Stack exception_trace; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -103,7 +143,22 @@ public: bool finterrupted; public: - + size_t register_file(StringBody file_spec); + + struct Exception_details { + const Trace trace; + const String* problem_source; + VHash& vhash; + + Exception_details( + const Trace atrace, + const String* aproblem_source, + VHash& avhash): + trace(atrace), problem_source(aproblem_source), vhash(avhash) {} + + }; + Exception_details get_details(const Exception& e); + /// @see Stack::wipe_unused void wipe_unused_execution_stack() { stack.wipe_unused(); @@ -152,12 +207,15 @@ public: /// 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* main_alias=0, bool ignore_class_path=false, - bool fail_on_read_problem=true, bool fail_on_file_absence=true); // pa_request.C + bool fail_on_read_problem=true, + bool fail_on_file_absence=true); // pa_request.C /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, - const String& filespec, const char* filespec_cstr); // pa_request.C + const String* main_alias, + uint file_no); // pa_request.C /// processes any code-junction there may be inside of @a value StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C @@ -297,7 +355,9 @@ private: private: // compile.C - VStateless_class& compile(VStateless_class* aclass, const char* source, const char* file); + VStateless_class& compile(VStateless_class* aclass, + const char* source, const String* main_alias, + uint file_no); private: // execute.C @@ -319,7 +379,7 @@ private: // execute.C /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); - Value& get_element(bool can_call_operator); + Value& get_element(Value& ncontext, const String& name, bool can_call_operator); private: // defaults @@ -362,13 +422,13 @@ class Request_context_saver { Request& fr; /// exception stack trace - int exception_trace; + size_t exception_trace; /// execution stack - int stack; + size_t stack; /// contexts - VMethodFrame *method_frame; - Value *rcontext; - WContext *wcontext; + VMethodFrame* method_frame; + Value* rcontext; + WContext* wcontext; /// current language String::Language flang; /// current connection @@ -376,7 +436,7 @@ class Request_context_saver { public: Request_context_saver(Request& ar) : - //exception_trace(ar.exception_trace.top_index()), + exception_trace(ar.exception_trace.top_index()), stack(ar.stack.top_index()), method_frame(ar.method_frame), rcontext(ar.rcontext), @@ -385,7 +445,7 @@ public: fconnection(ar.fconnection), fr(ar) {} void restore() { - //fr.exception_trace.top_index(exception_trace); + fr.exception_trace.top_index(exception_trace); fr.stack.top_index(stack); fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; fr.flang=flang; @@ -437,6 +497,11 @@ extern const String content_disposition_ extern const String content_disposition_value; extern const String content_disposition_filename_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"