--- parser3/src/include/pa_request.h	2001/02/21 16:11:49	1.6
+++ parser3/src/include/pa_request.h	2001/03/11 08:02:05	1.35
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_request.h,v 1.6 2001/02/21 16:11:49 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru>
+
+	$Id: pa_request.h,v 1.35 2001/03/11 08:02:05 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -8,78 +12,101 @@
 #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"
+#include "pa_vclass.h"
+
+#define MAIN_METHOD_NAME "main"
+#define AUTO_METHOD_NAME "auto"
+#define MAIN_CLASS_NAME "MAIN"
+
+#define ROOT_CLASS_NAME "ROOT"
+#define ENV_CLASS_NAME "ENV"
+
+#ifndef NO_STRING_ORIGIN
+#	define COMPILE_PARAMS char *source, String *name, VClass *base_class, char *file
+#	define COMPILE(source, name, base_class, file) real_compile(source, name, base_class, file)
+#else
+#	define COMPILE_PARAMS char *source, String *name, VClass *base_class
+#	define COMPILE(source, name, base_class, file) real_compile(source, name, base_class)
+#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),
-		fclasses(apool)
-		{
-	}
+	Request(Pool& 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; }
+	Array& classes_array() { return fclasses_array; }
 
 	// core request processing
 	void core();
 
-protected: // core
+	VClass *use(char *file, 
+		String *name=0, 
+		VClass *base_class=0, 
+		bool fail_on_read_problem=true); // core.C
+	Value& autocalc(
+		Value& value, 
+		const String *name=0, 
+		bool make_string=true); // execute.C
 
-	// classes
-	Hash fclasses;
+	void write(const String& astring) {
+		wcontext->write(astring, String::Untaint_lang::NO);  // write(const) = clean
+	}
+
+	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 *root, *self, *rcontext;
+	Value *self, *root, *rcontext;
 	WContext *wcontext;
-	
-	Array& load_and_compile_RUN();
-	VClass *construct_class(String& name, Array& compiled_methods);
-	char *execute_MAIN(Value *class_RUN);
-
-protected:
-
-	// all request' objects are allocated in this pool
-	Pool& fpool;
-
-	// 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:
+private: // core data
 
-	// current request's exception object
-	Exception *fexception;
+	// classes
+	Hash fclasses;
+	Array fclasses_array;
 
-};
+	// execution stack
+	Stack stack;
 
-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); }
-};
+private: // core.C
+
+	char *execute_MAIN();
+
+private: // compile.C
+
+	VClass& real_compile(COMPILE_PARAMS);
 
+private: // execute.C
+
+	char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr);
+	void execute(const Array& ops);
+
+	Value *get_element();
+
+private: // lang&raw 
+	
+	String::Untaint_lang lang;
+
+private: // lang&raw manipulation
+
+	// TODO
+};
 
 #endif