--- parser3/src/include/pa_request.h	2001/02/22 13:33:24	1.9
+++ parser3/src/include/pa_request.h	2001/02/25 09:14:01	1.14
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.9 2001/02/22 13:33:24 paf Exp $
+  $Id: pa_request.h,v 1.14 2001/02/25 09:14:01 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -11,15 +11,17 @@
 #include "pa_wcontext.h"
 #include "pa_value.h"
 #include "pa_stack.h"
+#include "pa_vclass.h"
 
 #define MAIN_METHOD_NAME "main"
+#define NAME_RUN "RUN"
 
 #ifndef NO_STRING_ORIGIN
-#	define COMPILE_PARAMS char *source, char *file
-#	define COMPILE(source, file) real_compile(source, file)
+#	define COMPILE_PARAMS char *source, String *default_name, char *file
+#	define COMPILE(source, default_name, file) real_compile(source, default_name, file)
 #else
-#	define COMPILE_PARAMS char *source
-#	define COMPILE(source, file) real_compile(source)
+#	define COMPILE_PARAMS char *source, String *default_name
+#	define COMPILE(source, default_name, file) real_compile(source, default_name)
 #endif
 
 class Local_request_exception;
@@ -29,13 +31,15 @@ public:
 	
 	Request(Pool& apool) : Pooled(apool),
 		stack(apool),
-		fclasses(apool)
+		fclasses(apool),
+		fclasses_array(apool)
 		{
 	}
 	~Request() {}
 
 	// global classes
 	Hash& classes() { return fclasses; }
+	Array& classes_array() { return fclasses_array; }
 
 	// core request processing
 	void core();
@@ -44,27 +48,30 @@ 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 *alias);
+
 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);
+	void execute(const Array& ops);
 
 	Value *get_element();