--- 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 06:54:27	1.160.2.37.2.19
@@ -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 06:54:27 $";
 
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -45,23 +45,7 @@ class Request: public PA_Object {
 	friend class Request_context_saver;
 	friend class Temp_request_self;
 
-	///@{ core data
-
-	/// classes
-	HashStringValue fclasses;
-
-	/// already used files to avoid cyclic uses
-	Hash<const StringBody, bool> used_files;
-
-	/**	endless execute(execute(... preventing counter 
-		@see ANTI_ENDLESS_EXECUTE_RECOURSION
-	*/
-	uint anti_endless_execute_recoursion;
-
-	///@}
-
 	union StackItem {
-	private:
 		Value* fvalue;
 		ArrayOperation* fops;
 		VMethodFrame* fmethod_frame;
@@ -82,14 +66,42 @@ class Request: public PA_Object {
 		StackItem(VMethodFrame& amethod_frame): fmethod_frame(&amethod_frame) {}
 	};
 
+	class Trace {
+		const String* fname;
+		Operation::Info forigin;
+	public:
+		Trace(const String* aname, Operation::Info aorigin):
+			fname(aname), forigin(aorigin) {}
+
+		const String* name() { return fname; }
+		Operation::Info origin() { return forigin; }
+	};
+
+	///@{ core data
+
+	/// classes
+	HashStringValue fclasses;
+
+	/// already used files to avoid cyclic uses
+	Hash<const StringBody, bool> used_files;
+	/// list of all used files, Operation::file_no = index to it
+	Array<StringBody> file_list;
+
+	/**	endless execute(execute(... preventing counter 
+		@see ANTI_ENDLESS_EXECUTE_RECOURSION
+	*/
+	uint anti_endless_execute_recoursion;
+
+	///@}
+
 	/// execution stack
 	Stack<StackItem> stack;
 
+	/// exception stack trace
+	Stack<Trace> exception_trace;
 public:
 
 	//@{ request processing status
-	/// exception stack trace
-	//Stack<String*> exception_trace;
 	/// contexts
 	VMethodFrame* method_frame;
 	Value* rcontext;
@@ -157,7 +169,7 @@ public:
 	/// compiles a @a source buffer
 	void use_buf(VStateless_class& aclass,
 		const char* source, 
-		const String& filespec, const char* filespec_cstr); // pa_request.C
+		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 +309,7 @@ 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, uint file_no);
 
 private: // execute.C
 
@@ -319,7 +331,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 +374,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 +388,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 +397,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;