--- parser3/src/include/pa_request.h	2001/02/21 16:11:49	1.6
+++ parser3/src/include/pa_request.h	2001/02/22 13:33:24	1.9
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.6 2001/02/21 16:11:49 paf Exp $
+  $Id: pa_request.h,v 1.9 2001/02/22 13:33:24 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -8,34 +8,39 @@
 #include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_hash.h"
-#include "pa_context.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, 
-		Value *aroot, Value *aself, Value *arcontext, WContext *awcontext) : 
-		fpool(apool), 
-		root(aroot), self(aself), rcontext(arcontext), wcontext(awcontext),
+	Request(Pool& apool) : Pooled(apool),
+		stack(apool),
 		fclasses(apool)
 		{
 	}
 	~Request() {}
 
-	// IMPORTANT: don't use pool without  Local_request_exception 
-	Pool& pool() { return fpool; }
-
-	Exception& exception() { return *fexception; }
+	// global classes
 	Hash& classes() { return fclasses; }
 
 	// core request processing
 	void core();
 
-protected: // core
+private: // core data
 
 	// classes
 	Hash fclasses;
@@ -44,42 +49,28 @@ protected: // core
 	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(Value *class_RUN);
+	char *execute_MAIN(VClass *class_RUN);
 
-protected:
+private: // compile.C
 
-	// all request' objects are allocated in this pool
-	Pool& fpool;
+	Array& real_compile(COMPILE_PARAMS);
 
-	// 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: // execute.C
 
-private:
+	void execute(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();
 
 #endif