--- parser3/src/include/pa_request.h	2001/01/30 13:07:31	1.4
+++ parser3/src/include/pa_request.h	2001/02/22 10:43:42	1.8
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.4 2001/01/30 13:07:31 paf Exp $
+  $Id: pa_request.h,v 1.8 2001/02/22 10:43:42 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -7,52 +7,68 @@
 
 #include "pa_pool.h"
 #include "pa_exception.h"
+#include "pa_hash.h"
+#include "pa_wcontext.h"
+#include "pa_value.h"
+#include "pa_stack.h"
+
+#define MAIN_METHOD_NAME "main"
+
+#ifndef NO_STRING_ORIGIN
+#	define COMPILE_PARAMS char *source, char *file
+#	define COMPILE(source, file) real_compile(source, file)
+#else
+#	define COMPILE_PARAMS char *source
+#	define COMPILE(source, file) real_compile(source)
+#endif
 
 class Local_request_exception;
 
-class Request {
-	friend Local_request_exception;
+class Request : public Pooled {
 public:
 	
-	Request(Pool& apool) : fpool(apool) {}
+	Request(Pool& apool) : Pooled(apool),
+		stack(apool),
+		fclasses(apool)
+		{
+	}
 	~Request() {}
 
-	Pool& pool() { return fpool; }
+	// global classes
+	Hash& classes() { return fclasses; }
 
-	Exception& exception() { return *fexception; }
+	// core request processing
+	void core();
 
-protected:
+private: // core data
 
-	// all request' objects are allocated in this pool
-	Pool& fpool;
+	// classes
+	Hash fclasses;
 
-	// 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;
-	}
+	// contexts
+	Value *root, *self, *rcontext;
+	WContext *wcontext;
+	
+	// execution stack
+	Stack stack;
 
-private:
+private: // core.C
 
-	// current request's exception object
-	Exception *fexception;
+	Array& load_and_compile_RUN();
+	VClass *construct_class(String& name, Array& compiled_methods);
+	char *execute_MAIN(VClass *class_RUN);
 
-};
+private: // compile.C
+
+	Array& real_compile(COMPILE_PARAMS);
+
+private: // execute.C
+
+	void execute(Array& ops);
 
-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();
 
 #endif