--- parser3/src/include/pa_request.h 2003/07/24 11:31:21 1.162 +++ parser3/src/include/pa_request.h 2003/09/29 10:51:02 1.164 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/07/24 11:31:21 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/09/29 10:51:02 $"; #include "pa_hash.h" #include "pa_wcontext.h" @@ -111,9 +111,9 @@ private: 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; + Array file_list; /** endless execute(execute(... preventing counter @see ANTI_ENDLESS_EXECUTE_RECOURSION @@ -143,7 +143,7 @@ public: bool finterrupted; public: - size_t register_file(StringBody file_spec); + size_t register_file(String::Body file_spec); struct Exception_details { const Trace trace; @@ -338,7 +338,7 @@ public: // charset helpers /// @see Charset::transcode GdomeDOMString_auto_ptr transcode(const String& s); /// @see Charset::transcode - GdomeDOMString_auto_ptr transcode(const StringBody s); + GdomeDOMString_auto_ptr transcode(const String::Body s); /// @see Charset::transcode const String& transcode(GdomeDOMString* s); /// @see Charset::transcode @@ -362,7 +362,7 @@ private: // compile.C private: // execute.C /// for @postprocess[body] - const String& execute_method(VMethodFrame& amethodFrame, const Method& method); + StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); //{ for @conf[filespec] and @auto[filespec] const String* execute_method(Value& aself, const Method& method, VString* optional_param,