--- parser3/src/include/pa_request.h	2001/02/24 15:26:02	1.12
+++ parser3/src/include/pa_request.h	2001/02/25 16:36:11	1.15
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_request.h,v 1.12 2001/02/24 15:26:02 paf Exp $
+  $Id: pa_request.h,v 1.15 2001/02/25 16:36:11 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -14,16 +14,14 @@
 #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
-#	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;
@@ -53,7 +51,8 @@ private: // core data
 	Array fclasses_array;
 
 	// contexts
-	Value *self, *root, *rcontext;
+	VAliased *self;
+	Value *root, *rcontext;
 	WContext *wcontext;
 	
 	// execution stack
@@ -61,7 +60,7 @@ private: // core data
 
 public: // core.C
 
-	void use(char *file, String *name);
+	void use(char *file, String *alias);
 
 private: // core.C