--- parser3/src/include/pa_request.h	2001/03/12 18:13:49	1.44
+++ parser3/src/include/pa_request.h	2001/03/13 17:54:13	1.50
@@ -3,43 +3,35 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.44 2001/03/12 18:13:49 paf Exp $
+	$Id: pa_request.h,v 1.50 2001/03/13 17:54:13 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
 #include "pa_pool.h"
-#include "pa_exception.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
 #include "pa_value.h"
 #include "pa_stack.h"
 #include "pa_vclass.h"
-
-#define UNNAMED_NAME "unnamed"
-
-#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"
-#define TABLE_CLASS_NAME "table"
+#include "pa_vobject.h"
+#include "pa_venv.h"
+#include "pa_vform.h"
 
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
-		VClass *aclass, const String *name, \
-		VClass *base_class, \
+		VStateless_class *aclass, const String *name, \
+		VStateless_class *base_class, \
 		const char *file
 #	define COMPILE(source, aclass, name, base_class, file)  \
 		real_compile(source, aclass, name, base_class, file)
 #else
 #	define COMPILE_PARAMS  \
 		const char *source, \
-		VClass *aclass, const String *name, \
-		VClass *base_class
+		VStateless_class *aclass, const String *name, \
+		VStateless_class *base_class
 #	define COMPILE(source, aclass, name, base_class, file)  \
 		real_compile(source, aclass, name, base_class)
 #endif
@@ -50,26 +42,30 @@ class Request : public Pooled {
 	friend Temp_lang;
 public:
 	
-	Request(Pool& apool);
+	Request(Pool& apool,
+		String::Untaint_lang alang,
+
+		char *adocument_root,
+		char *apage_filespec		
+	);
 	~Request() {}
 
 	// global classes
 	Hash& classes() { return fclasses; }
-	Array& classes_array() { return fclasses_array; }
 
 	// core request processing
-	void core();
+	char *core(bool& error);
 
 	void execute(const Array& ops);
 
-	VClass *use_file(
+	VStateless_class *use_file(
 		const char *file, bool fail_on_read_problem=true,
-		VClass *aclass=0, const String *name=0, 
-		VClass *base_class=0); // core.C
-	VClass *use_buf(
+		const String *name=0, 
+		VStateless_class *base_class=0); // core.C
+	VStateless_class *use_buf(
 		const char *source, const char *file,
-		VClass *aclass=0, const String *name=0, 
-		VClass *base_class=0); // core.C
+		VStateless_class *aclass=0, const String *name=0, 
+		VStateless_class *base_class=0); // core.C
 	Value& process(
 		Value& value, 
 		const String *name=0,
@@ -78,6 +74,10 @@ public:
 	void write(const String& astring) {
 		wcontext->write(astring, String::Untaint_lang::NO);  // write(const) = clean
 	}
+	void write_no_lang(String& astring) {
+		// appending, sure of clean string inside
+		wcontext->write(astring, String::Untaint_lang::NO);
+	}
 
 	void write_assign_lang(Value& avalue) {
 		// appending possible string, assigning untaint language
@@ -87,6 +87,10 @@ public:
 		// appending possible string, passing language built into string being written
 		wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); 
 	}
+	void write_no_lang(Value& avalue) {
+		// appending sure value, no strings inside
+		wcontext->write(avalue, String::Untaint_lang::NO); 
+	}
 
 	void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg);
 
@@ -97,8 +101,10 @@ public:
 	
 	// default base
 	VClass root_class;
-	// $ENV:fields here
-	VClass env_class;
+	// $env:fields here
+	VEnv env_class;
+	// $form:elements here
+	VForm form_class;
 
 	// contexts
 	Value *self, *root, *rcontext;
@@ -108,22 +114,18 @@ private: // core data
 
 	// classes
 	Hash fclasses;
-	Array fclasses_array;
 
 	// execution stack
 	Stack stack;
 
-private: // core.C
-
-	char *execute_MAIN();
-
 private: // compile.C
 
-	VClass& real_compile(COMPILE_PARAMS);
+	VStateless_class& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr);
+	char *execute_method(Value& aself, const Method& method, bool return_cstr);
+	char *execute_method(Value& aself, const String& method_name, bool return_cstr);
 
 	Value *get_element();
 
@@ -144,8 +146,8 @@ private: // lang manipulation
 
 private: // web
 
-	const char *document_root;
-	const char *page_filespec;
+	const char *fdocument_root;
+	const char *fpage_filespec;
 
 };