--- parser3/src/include/pa_request.h	2001/04/15 12:32:59	1.82
+++ parser3/src/include/pa_request.h	2001/05/17 15:20:15	1.89
@@ -5,12 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.82 2001/04/15 12:32:59 paf Exp $
+	$Id: pa_request.h,v 1.89 2001/05/17 15:20:15 parser Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
+#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -43,6 +44,7 @@
 #endif
 
 class Temp_lang;
+class Methoded;
 
 /// Main workhorse.
 class Request : public Pooled {
@@ -85,7 +87,7 @@ public:
 		bool header_only);
 
 	/// executes ops
-	void execute(const Array& ops);
+	void execute(const Array& ops); // execute.C
 
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
 	VStateless_class *use_file(
@@ -145,16 +147,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
@@ -162,24 +164,34 @@ 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
 
-	// classes
+	/// classes
 	Hash fclasses;
 
-	// already used files to avoid cyclic uses
+	/// already used files to avoid cyclic uses
 	Hash used_files;
 
-	// execution stack
+	/// execution stack
 	Stack stack;
 
+	/**	endless execute(execute(... preventing counter 
+		@see ANTI_ENDLESS_EXECUTE_RECOURSION
+	*/
+	uint anti_endless_execute_recoursion;
+
 private: // compile.C
 
 	VStateless_class& real_compile(COMPILE_PARAMS);