--- parser3/src/include/pa_request.h 2003/03/24 13:43:41 1.160.2.37.2.10 +++ parser3/src/include/pa_request.h 2003/09/25 09:15:02 1.163 @@ -8,9 +8,8 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/03/24 13:43:41 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/09/25 09:15:02 $"; -#include "pa_request_info.h" #include "pa_hash.h" #include "pa_wcontext.h" #include "pa_value.h" @@ -26,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 @@ -33,11 +33,11 @@ class Temp_lang; class Methoded; class VMethodFrame; class GdomeDOMString_auto_ptr; -class VMail; DECLARE_OBJECT_PTR(VMail); -class VForm; DECLARE_OBJECT_PTR(VForm); -class VResponse; DECLARE_OBJECT_PTR(VResponse); -class VCookie; DECLARE_OBJECT_PTR(VCookie); -class VStateless_class; DECLARE_OBJECT_PTR(VStateless_class); +class VMail; +class VForm; +class VResponse; +class VCookie; +class VStateless_class; /// Main workhorse. class Request: public PA_Object { @@ -45,6 +45,65 @@ class Request: public PA_Object { friend class Temp_connection; friend class Request_context_saver; friend class Temp_request_self; + friend class Exception_trace; + +public: + class Trace { + const String* fname; + Operation::Origin forigin; + public: + Trace(): fname(0) {} + void clear() { fname=0; } + operator bool() const { return fname!=0; } + + Trace(const String* aname, const Operation::Origin aorigin): + fname(aname), forigin(aorigin) {} + + const String* name() const { return fname; } + const Operation::Origin origin() const { return forigin; } + }; + + +private: + union StackItem { + Value* fvalue; + ArrayOperation* fops; + VMethodFrame* fmethod_frame; + public: + Value& value() const { return *fvalue; } + const String& string() const { + const String* result=fvalue->get_string(); + assert(result); + return *result; + } + 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) {} + }; + + 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 @@ -52,7 +111,9 @@ class Request: public PA_Object { HashStringValue fclasses; /// already used files to avoid cyclic uses - Hash used_files; + 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 @@ -61,26 +122,14 @@ class Request: public PA_Object { ///@} -public: - - union StackItem { - const String* string() const { return value->get_string(); } - Value* value; - ArrayOperation* ops; - VMethodFrame* method_frame; + /// execution stack + Stack stack; - /// needed to fill unused Array entries - StackItem() {} - StackItem(Value* avalue): value(avalue) {} - StackItem(ArrayOperation* aops): ops(aops) {} - StackItem(VMethodFrame* amethod_frame): method_frame(amethod_frame) {} - }; + /// exception stack trace + Exception_trace exception_trace; +public: //@{ request processing status - /// exception stack trace - //Stack exception_trace; - /// execution stack - Stack stack; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -94,6 +143,26 @@ public: bool finterrupted; public: + size_t register_file(String::Body 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(); + } #ifdef RESOURCES_DEBUG /// measures @@ -138,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 @@ -266,17 +338,11 @@ public: // charset helpers /// @see Charset::transcode GdomeDOMString_auto_ptr transcode(const String& s); /// @see Charset::transcode - const String& transcode(GdomeDOMString* s -#ifndef NO_STRING_ORIGIN - , const String& origin -#endif - ); + GdomeDOMString_auto_ptr transcode(const String::Body s); /// @see Charset::transcode - const String& transcode(xmlChar* s -#ifndef NO_STRING_ORIGIN - , const String& origin -#endif - ); + const String& transcode(GdomeDOMString* s); + /// @see Charset::transcode + const String& transcode(xmlChar* s); #endif @@ -289,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 @@ -311,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 @@ -354,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 @@ -368,8 +436,8 @@ class Request_context_saver { public: Request_context_saver(Request& ar) : - //exception_trace(ar.exception_trace.top_index()), - stack(ar.stack.top_index()), + exception_trace(ar.exception_trace.top()), + stack(ar.stack.top()), method_frame(ar.method_frame), rcontext(ar.rcontext), wcontext(ar.wcontext), @@ -377,8 +445,8 @@ public: fconnection(ar.fconnection), fr(ar) {} void restore() { - //fr.exception_trace.top_index(exception_trace); - fr.stack.top_index(stack); + fr.exception_trace.top(exception_trace); + fr.stack.top(stack); fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; fr.flang=flang; fr.fconnection=fconnection; @@ -429,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"