--- parser3/src/include/pa_request.h	2002/08/01 11:26:47	1.141
+++ parser3/src/include/pa_request.h	2002/10/14 15:22:41	1.154
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Id: pa_request.h,v 1.141 2002/08/01 11:26:47 paf Exp $";
+static const char* IDENT_REQUEST_H="$Date: 2002/10/14 15:22:41 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -40,19 +40,15 @@ const uint ANTI_ENDLESS_EXECUTE_RECOURSI
 
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
-		const char *source, \
-		VStateless_class *aclass, const String *name, \
-		VStateless_class *base_class, \
-		const char *file
-#	define COMPILE(source, aclass, name, base_class, file)  \
-		real_compile(source, aclass, name, base_class, file)
+		VStateless_class& aclass, const char *source \
+		, const char *file
+#	define COMPILE(aclass, source, file)  \
+		real_compile(aclass, source, file)
 #else
 #	define COMPILE_PARAMS  \
-		const char *source, \
-		VStateless_class *aclass, const String *name, \
-		VStateless_class *base_class
-#	define COMPILE(source, aclass, name, base_class, file)  \
-		real_compile(source, aclass, name, base_class)
+		VStateless_class& aclass, const char *source
+#	define COMPILE(aclass, source, file)  \
+		real_compile(aclass, source)
 #endif
 
 class Temp_lang;
@@ -63,6 +59,7 @@ class VMethodFrame;
 class Request : public Pooled {
 	friend class Temp_lang;
 	friend class Temp_connection;
+	friend class Request_context_saver;
 public:
 
 #ifdef RESOURCES_DEBUG
@@ -121,16 +118,14 @@ public:
 	}
 
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
-	VStateless_class *use_file(
+	VStateless_class *use_file(VStateless_class& aclass,
 		const String& file_name, 
-		bool ignore_class_path=false, bool fail_on_read_problem=true,
-		const String *name=0, 
-		VStateless_class *base_class=0); // core.C
+		bool ignore_class_path=false, 
+		bool fail_on_read_problem=true, bool fail_on_file_absence=true); // core.C
 	/// compiles a @a source buffer
-	VStateless_class *use_buf(
-		const char *source, const String& filespec, const char *filespec_cstr,
-		VStateless_class *aclass=0, const String *name=0, 
-		VStateless_class *base_class=0); // core.C
+	VStateless_class *use_buf(VStateless_class& aclass,
+		const char *source, 
+		const String& filespec, const char *filespec_cstr); // core.C
 
 	/// processes any code-junction there may be inside of @a value
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
@@ -218,22 +213,20 @@ public:
 		return fconnection; 
 	}
 
-	bool origins_mode() {
-		return main_class->get_element(*origins_mode_name)!=0;  // $ORIGINS mode
-	}
+	bool origins_mode();
 
 public:
 	
 	/// info from web server
 	Info& info;
 	/// user's post data
-	char *post_data;  size_t post_size;
+	const char *post_data;  size_t post_size;
 
 	/// name of 'main' method
 	const String main_method_name;
 	
-	/// operators are methods of this class
-	Methoded& OP;
+	/// 'MAIN' class conglomerat & operators are methods of this class
+	VClass& main_class;
 	/// $env:fields
 	VEnv env;
 	/// $status:fields
@@ -251,22 +244,31 @@ public:
 	/// $cookie:elements
 	VCookie cookie;
 
+	/// classes configured data
+	Hash classes_conf;
+
+private:
+
 	//@{ request processing status
+	/// exception stack trace
+	Stack exception_trace;
 	/// execution stack
 	Stack stack;
 	/// contexts
-	Value *self, *root, *rcontext;
-	/// contexts
+	Value *self;
+	VMethodFrame *method_frame;
+	Value *rcontext;
 	WContext *wcontext;
-	/// exception stack trace
-	Stack exception_trace;
+	/// current language
+	uchar flang; 
+	/// current connection
+	SQL_Connection *fconnection;
 	//@}
 
-	/// 'MAIN' class conglomerat
-	VStateless_class *main_class;
+public: // status read methods
 
-	/// classes configured data
-	Hash classes_conf;
+	Value *get_self() { return self; }
+	VMethodFrame *get_method_frame() { return method_frame; }
 
 private: // core data
 
@@ -308,7 +310,8 @@ private: // execute.C
 	/// for @main[]
 	const String *execute_virtual_method(Value& aself, const String& method_name);
 
-	Value *get_element(const String *& remember_name, bool can_call_operator);
+	Value *get_element(const String *& remember_name, 
+		bool can_call_operator, bool should_explode_junction=false/*there's only one place when true*/);
 
 private: // defaults
 
@@ -331,11 +334,6 @@ private: // lang manipulation
 		flang=alang;
 	}
 
-private: // lang&raw 
-	
-	uchar flang;
-
-
 private: // connection manipulation
 
 	SQL_Connection *set_connection(SQL_Connection *aconnection) {
@@ -349,10 +347,45 @@ private: // connection manipulation
 
 private:
 
-	/// connection
+	void output_result(const VFile& body_file, bool header_only);
+};
+
+/// Auto-object used to save request context across ^try body
+class Request_context_saver {
+	Request& fr;
+
+	/// exception stack trace
+	int exception_trace;
+	/// execution stack
+	int stack;
+	/// contexts
+	Value *self;
+	VMethodFrame *method_frame;
+	Value *rcontext;
+	WContext *wcontext;
+	/// current language
+	uchar flang; 
+	/// current connection
 	SQL_Connection *fconnection;
 
-	void output_result(const VFile& body_file, bool header_only);
+public:
+	Request_context_saver(Request& ar) : 
+		exception_trace(ar.exception_trace.top_index()),	
+		stack(ar.stack.top_index()),
+		self(ar.self),
+		method_frame(ar.method_frame),
+		rcontext(ar.rcontext),
+		wcontext(ar.wcontext),
+		flang(ar.flang),
+		fconnection(ar.fconnection),
+		fr(ar) {}
+	void restore() {
+		fr.exception_trace.top_index(exception_trace);
+		fr.stack.top_index(stack);
+		fr.self=self; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
+		fr.flang=flang;
+		fr.fconnection=fconnection;
+	}
 };
 
 ///	Auto-object used for temporary changing Request::flang.