--- parser3/src/include/pa_request.h	2001/02/21 17:36:30	1.7
+++ parser3/src/include/pa_request.h	2001/02/24 15:26:02	1.12
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.7 2001/02/21 17:36:30 paf Exp $
+  $Id: pa_request.h,v 1.12 2001/02/24 15:26:02 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -11,8 +11,12 @@
 #include "pa_wcontext.h"
 #include "pa_value.h"
 #include "pa_stack.h"
+#include "pa_vclass.h"
 
 #define MAIN_METHOD_NAME "main"
+#define SELF_NAME "self"
+#define USES_NAME "USES"
+#define NAME_RUN "RUN"
 
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS char *source, char *file
@@ -25,22 +29,19 @@
 class Local_request_exception;
 
 class Request : public Pooled {
-	friend Local_request_exception;
 public:
 	
 	Request(Pool& apool) : Pooled(apool),
-		fpool(apool), 
 		stack(apool),
-		fclasses(apool)
+		fclasses(apool),
+		fclasses_array(apool)
 		{
 	}
 	~Request() {}
 
-	// IMPORTANT: don't use without  Local_request_exception 
-	Exception& exception() { return *fexception; }
-
 	// global classes
 	Hash& classes() { return fclasses; }
+	Array& classes_array() { return fclasses_array; }
 
 	// core request processing
 	void core();
@@ -49,61 +50,35 @@ private: // core data
 
 	// classes
 	Hash fclasses;
+	Array fclasses_array;
 
 	// contexts
-	Value *root, *self, *rcontext;
+	Value *self, *root, *rcontext;
 	WContext *wcontext;
 	
 	// execution stack
 	Stack stack;
 
+public: // core.C
+
+	void use(char *file, String *name);
+
 private: // core.C
 
-	Array& load_and_compile_RUN();
-	VClass *construct_class(String& name, Array& compiled_methods);
-	char *execute_MAIN(VClass *class_RUN);
+	char *execute_MAIN();
 
 private: // compile.C
 
-	Array& real_compile(COMPILE_PARAMS);
+	VClass& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	void execute(Array& ops);
-
-protected:
-
-	// all request' objects are allocated in this pool
-	Pool& fpool;
-
-	// exception replacement mechanism is protected from direct usage
-	// Local_request_exception object enforces paired set/restore
-	Exception *set_exception(Exception *e){
-		Exception *r=fexception;
-		fexception=e;
-		return r;
-	}
-	void restore_exception(Exception *e) {
-		fexception=e;
-	}
-
-private:
+	void execute(const Array& ops);
 
-	// current request's exception object
-	Exception *fexception;
+	Value *get_element();
 
 };
 
-class Local_request_exception {
-	Request request;
-	Exception *saved_exception;
-public:
-	Local_request_exception(Request& arequest, Exception& exception) : 
-		request(arequest),
-		saved_exception(arequest.set_exception(&exception)) {}
-	~Local_request_exception() { request.restore_exception(saved_exception); }
-};
-
 // core func
 void core();