--- parser3/src/include/pa_request.h	2001/04/09 09:48:18	1.81
+++ parser3/src/include/pa_request.h	2001/04/28 13:25:01	1.87
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.81 2001/04/09 09:48:18 paf Exp $
+	$Id: pa_request.h,v 1.87 2001/04/28 13:25:01 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -43,6 +43,7 @@
 #endif
 
 class Temp_lang;
+class Methoded;
 
 /// Main workhorse.
 class Request : public Pooled {
@@ -128,10 +129,6 @@ public:
 		wcontext->write(avalue); 
 	}
 
-	/// handy is-value-a-junction ensurer
-	void fail_if_junction_(bool is, Value& value, 
-		const String& method_name, const char *msg);
-
 	/// returns relative to @a path  path to @a file 
 	const String& relative(const char *apath, const String& relative_name);
 
@@ -149,16 +146,16 @@ public:
 	char *post_data;  size_t post_size;
 
 	/// operators are methods of this class
-	VClass OP;
-	/// $env:fields here
+	Methoded& OP;
+	/// $env:fields
 	VEnv env;
-	/// $form:elements here
+	/// $form:elements
 	VForm form;
-	/// $request:elements here
+	/// $request:elements
 	VRequest request;
-	/// $response:
+	/// $response:elements
 	VResponse response;
-	/// $cookie:
+	/// $cookie:elements
 	VCookie cookie;
 
 	/// contexts
@@ -166,12 +163,17 @@ public:
 	/// contexts
 	WContext *wcontext;
 
+	/// 'MAIN' class conglomerat
+	VStateless_class *main_class;
+
 	/// connection
 	SQL_Connection *connection;
-	/// table of protocol's libraries. read from $SQL:drivers
-	Table *protocol2library;
-	/// mail options
-	Hash *mail;
+	/// PCRE character tables
+	unsigned char *pcre_tables;
+
+	/// classes configured data
+	Hash classes_conf;
+
 
 private: // core data