--- parser3/src/include/pa_request.h	2003/04/03 09:18:45	1.160.2.37.2.20
+++ parser3/src/include/pa_request.h	2003/11/07 13:59:21	1.168
@@ -8,8 +8,9 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/04/03 09:18:45 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/11/07 13:59:21 $";
 
+#include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
 #include "pa_value.h"
@@ -25,6 +26,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
 
@@ -49,19 +51,23 @@ class Request: public PA_Object {
 public:
 	class Trace {
 		const String* fname;
-		Operation::Info forigin;
+		Operation::Origin forigin;
 	public:
 		Trace(): fname(0) {}
 		void clear() { fname=0; }
 		operator bool() const { return fname!=0; }
 
-		Trace(const String* aname, const Operation::Info aorigin):
+		Trace(const String* aname, const Operation::Origin aorigin):
 			fname(aname), forigin(aorigin) {}
 
 		const String* name() const { return fname; }
-		const Operation::Info origin() const { return forigin; }
+		const Operation::Origin origin() const { return forigin; }
 	};
 
+private:
+	Pool fpool;
+public:
+	Pool& pool() { return fpool; }
 
 private:
 	union StackItem {
@@ -71,9 +77,7 @@ private:
 	public:
 		Value& value() const { return *fvalue; }
 		const String& string() const { 
-			const String* result=fvalue->get_string();
-			assert(result);
-			return *result; 
+			return fvalue->as_string();
 		}
 		ArrayOperation& ops() const { return *fops; }
 		VMethodFrame& method_frame() const { return *fmethod_frame; }
@@ -91,6 +95,7 @@ private:
 		Exception_trace(): fbottom(0) {}
 
 		size_t bottom_index() { return fbottom; }
+		void set_bottom_index(size_t abottom) { fbottom=abottom; }
 		element_type bottom_value() { return get(bottom_index()); }
 
 		void clear() {
@@ -110,9 +115,9 @@ private:
 	HashStringValue fclasses;
 
 	/// already used files to avoid cyclic uses
-	Hash<const StringBody, bool> used_files;
+	Hash<const String::Body, bool> used_files;
 	/// list of all used files, Operation::file_no = index to it
-	Array<StringBody> file_list;
+	Array<String::Body> file_list;
 
 	/**	endless execute(execute(... preventing counter 
 		@see ANTI_ENDLESS_EXECUTE_RECOURSION
@@ -142,6 +147,7 @@ public:
 	bool finterrupted;
 
 public:
+	size_t register_file(String::Body file_spec);
 
 	struct Exception_details {
 		const Trace trace;
@@ -151,9 +157,7 @@ public:
 		Exception_details(
 			const Trace atrace,
 			const String* aproblem_source,
-			VHash& avhash):
-			trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
-
+			VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
 	};
 	Exception_details get_details(const Exception& e);
 
@@ -205,11 +209,14 @@ 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* main_alias,
 		uint file_no); // pa_request.C
 
 	/// processes any code-junction there may be inside of @a value
@@ -333,7 +340,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
@@ -350,12 +357,14 @@ private:
 
 private: // compile.C
 
-	VStateless_class& compile(VStateless_class* aclass, const char* source, uint file_no);
+	VStateless_class& compile(VStateless_class* aclass, 
+		const char* source, const String* main_alias, 
+		uint file_no);
 
 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,
@@ -415,9 +424,11 @@ class Request_context_saver {
 	Request& fr;
 
 	/// exception stack trace
-	size_t exception_trace;
+	size_t exception_trace_top;
+	size_t exception_trace_bottom;
 	/// execution stack
 	size_t stack;
+	uint anti_endless_execute_recoursion;
 	/// contexts
 	VMethodFrame* method_frame;
 	Value* rcontext;
@@ -429,8 +440,10 @@ class Request_context_saver {
 
 public:
 	Request_context_saver(Request& ar) : 
-		exception_trace(ar.exception_trace.top_index()),	
+		exception_trace_top(ar.exception_trace.top_index()),	
+		exception_trace_bottom(ar.exception_trace.bottom_index()),	
 		stack(ar.stack.top_index()),
+		anti_endless_execute_recoursion(ar.anti_endless_execute_recoursion),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
@@ -438,8 +451,10 @@ public:
 		fconnection(ar.fconnection),
 		fr(ar) {}
 	void restore() {
-		fr.exception_trace.top_index(exception_trace);
-		fr.stack.top_index(stack);
+		fr.exception_trace.set_top_index(exception_trace_top);
+		fr.exception_trace.set_bottom_index(exception_trace_bottom);
+		fr.stack.set_top_index(stack);
+		fr.anti_endless_execute_recoursion=anti_endless_execute_recoursion;
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;