--- parser3/src/include/pa_request.h	2001/02/24 15:26:02	1.12
+++ parser3/src/include/pa_request.h	2001/03/10 13:07:09	1.26
@@ -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.26 2001/03/10 13:07:09 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -14,16 +14,17 @@
 #include "pa_vclass.h"
 
 #define MAIN_METHOD_NAME "main"
-#define SELF_NAME "self"
-#define USES_NAME "USES"
-#define NAME_RUN "RUN"
+#define RUN_NAME "RUN"
+
+#define ROOT_NAME "ROOT"
+#define ENV_NAME "ENV"
 
 #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 *name, char *file
+#	define COMPILE(source, name, file) real_compile(source, name, file)
 #else
-#	define COMPILE_PARAMS char *source
-#	define COMPILE(source, file) real_compile(source)
+#	define COMPILE_PARAMS char *source, String *name
+#	define COMPILE(source, name, file) real_compile(source, name)
 #endif
 
 class Local_request_exception;
@@ -31,12 +32,7 @@ class Local_request_exception;
 class Request : public Pooled {
 public:
 	
-	Request(Pool& apool) : Pooled(apool),
-		stack(apool),
-		fclasses(apool),
-		fclasses_array(apool)
-		{
-	}
+	Request(Pool& apool);
 	~Request() {}
 
 	// global classes
@@ -46,23 +42,34 @@ public:
 	// core request processing
 	void core();
 
+	void use(char *file, String *alias); // core.C
+	Value& autocalc(Value& value, const String *name=0, bool make_string=true); // execute.C
+
+	void write(Value& avalue) {
+		// appending possible string, assigning untaint language
+		wcontext->write(avalue, lang); 
+	}
+
+public:
+	
+	// default base
+	VClass root_class;
+	// $ENV:fields here
+	VClass env_class;
+
+	// contexts
+	Value *self, *root, *rcontext;
+	WContext *wcontext;
+
 private: // core data
 
 	// classes
 	Hash fclasses;
 	Array fclasses_array;
 
-	// contexts
-	Value *self, *root, *rcontext;
-	WContext *wcontext;
-	
 	// execution stack
 	Stack stack;
 
-public: // core.C
-
-	void use(char *file, String *name);
-
 private: // core.C
 
 	char *execute_MAIN();
@@ -77,9 +84,13 @@ private: // execute.C
 
 	Value *get_element();
 
-};
+private: // lang&raw 
+	
+	String::Untaint_lang lang;
 
-// core func
-void core();
+private: // lang&raw manipulation
+
+	// TODO
+};
 
 #endif