--- parser3/src/include/pa_request.h	2001/02/21 11:10:02	1.5
+++ parser3/src/include/pa_request.h	2001/02/21 17:36:30	1.7
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.5 2001/02/21 11:10:02 paf Exp $
+  $Id: pa_request.h,v 1.7 2001/02/21 17:36:30 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -8,24 +8,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 {
+class Request : public Pooled {
 	friend Local_request_exception;
 public:
 	
-	Request(Pool& apool) : 
+	Request(Pool& apool) : Pooled(apool),
 		fpool(apool), 
-		fclasses(new(apool) Hash(apool)) {
+		stack(apool),
+		fclasses(apool)
+		{
 	}
 	~Request() {}
 
-	// IMPORTANT: don't use pool without  Local_request_exception 
-	Pool& pool() { return fpool; }
-
+	// IMPORTANT: don't use without  Local_request_exception 
 	Exception& exception() { return *fexception; }
-	Hash& classes() { return *fclasses; }
+
+	// global classes
+	Hash& classes() { return fclasses; }
+
+	// core request processing
+	void core();
+
+private: // core data
+
+	// classes
+	Hash fclasses;
+
+	// contexts
+	Value *root, *self, *rcontext;
+	WContext *wcontext;
+	
+	// execution stack
+	Stack stack;
+
+private: // core.C
+
+	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);
 
 protected:
 
@@ -48,9 +92,6 @@ private:
 	// current request's exception object
 	Exception *fexception;
 
-	// defined classes
-	Hash *fclasses;
-
 };
 
 class Local_request_exception {
@@ -63,5 +104,7 @@ public:
 	~Local_request_exception() { request.restore_exception(saved_exception); }
 };
 
+// core func
+void core();
 
 #endif