--- parser3/src/include/pa_request.h	2002/09/18 12:40:38	1.149
+++ parser3/src/include/pa_request.h	2002/10/15 10:58:34	1.155
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2002/09/18 12:40:38 $";
+static const char* IDENT_REQUEST_H="$Date: 2002/10/15 10:58:34 $";
 
 #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;
@@ -64,6 +60,7 @@ class Request : public Pooled {
 	friend class Temp_lang;
 	friend class Temp_connection;
 	friend class Request_context_saver;
+	friend class Temp_request_self;
 public:
 
 #ifdef RESOURCES_DEBUG
@@ -122,17 +119,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, bool fail_on_file_absence=true,
-		const String *name=0, 
-		VStateless_class *base_class=0); // core.C
+		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
@@ -220,9 +214,7 @@ public:
 		return fconnection; 
 	}
 
-	bool origins_mode() {
-		return main_class->get_element(*origins_mode_name, main_class, false)!=0;  // $ORIGINS mode
-	}
+	bool origins_mode();
 
 public:
 	
@@ -234,8 +226,8 @@ public:
 	/// 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
@@ -253,9 +245,6 @@ public:
 	/// $cookie:elements
 	VCookie cookie;
 
-	/// 'MAIN' class conglomerat
-	VStateless_class *main_class;
-
 	/// classes configured data
 	Hash classes_conf;
 
@@ -322,7 +311,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
 
@@ -363,7 +353,6 @@ private:
 
 /// Auto-object used to save request context across ^try body
 class Request_context_saver {
-
 	Request& fr;
 
 	/// exception stack trace
@@ -391,7 +380,7 @@ public:
 		flang(ar.flang),
 		fconnection(ar.fconnection),
 		fr(ar) {}
-	~Request_context_saver() {
+	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;
@@ -400,6 +389,21 @@ public:
 	}
 };
 
+///	Auto-object used for temporary changing Request::self.
+class Temp_request_self {
+	Request& frequest;
+	Value *saved_self;
+public:
+	Temp_request_self(Request& arequest, Value& aself) :
+		frequest(arequest),
+		saved_self(arequest.self) {
+		frequest.self=&aself;
+	}
+	~Temp_request_self() {
+		frequest.self=saved_self;
+	}
+};
+
 ///	Auto-object used for temporary changing Request::flang.
 class Temp_lang {
 	Request& frequest;