--- parser3/src/include/pa_request.h 2003/03/24 17:52:19 1.160.2.37.2.11 +++ parser3/src/include/pa_request.h 2003/03/27 10:04:06 1.160.2.37.2.14 @@ -8,9 +8,8 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/03/24 17:52:19 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/03/27 10:04:06 $"; -#include "pa_request_info.h" #include "pa_hash.h" #include "pa_wcontext.h" #include "pa_value.h" @@ -33,11 +32,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 { @@ -61,8 +60,6 @@ class Request: public PA_Object { ///@} -public: - union StackItem { const String* string() const { return value->get_string(); } Value* value; @@ -76,11 +73,14 @@ public: StackItem(VMethodFrame* amethod_frame): method_frame(amethod_frame) {} }; + /// execution stack + Stack stack; + +public: + //@{ request processing status /// exception stack trace //Stack exception_trace; - /// execution stack - Stack stack; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -94,6 +94,11 @@ public: bool finterrupted; public: + + /// @see Stack::wipe_unused + void wipe_unused_execution_stack() { + stack.wipe_unused(); + } #ifdef RESOURCES_DEBUG /// measures @@ -266,6 +271,8 @@ public: // charset helpers /// @see Charset::transcode GdomeDOMString_auto_ptr transcode(const String& s); /// @see Charset::transcode + GdomeDOMString_auto_ptr transcode(const StringBody s); + /// @see Charset::transcode const String& transcode(GdomeDOMString* s); /// @see Charset::transcode const String& transcode(xmlChar* s);