--- parser3/src/include/pa_request.h	2001/11/19 12:17:05	1.111
+++ parser3/src/include/pa_request.h	2001/12/21 12:47:56	1.116
@@ -4,13 +4,12 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.111 2001/11/19 12:17:05 paf Exp $
+	$Id: pa_request.h,v 1.116 2001/12/21 12:47:56 paf 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"
@@ -27,6 +26,10 @@
 #include "pa_vcookie.h"
 #include "pa_sql_driver_manager.h"
 
+#ifdef RESOURCES_DEBUG
+#include <sys/resource.h>
+#endif
+
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
@@ -46,12 +49,19 @@
 
 class Temp_lang;
 class Methoded;
+class VMethodFrame;
 
 /// Main workhorse.
 class Request : public Pooled {
 	friend class Temp_lang;
 public:
 
+#ifdef RESOURCES_DEBUG
+	/// measures
+	double sql_connect_time;
+	double sql_request_time;
+#endif	
+
 	/// some information from web server
 	class Info {
 	public:
@@ -148,9 +158,6 @@ public:
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char *user_file_name_cstr);
 
-	/// PCRE character tables
-	const unsigned char *pcre_tables();
-
 public:
 	
 	/// info from web server
@@ -205,9 +212,6 @@ private: // core data
 	*/
 	uint anti_endless_execute_recoursion;
 
-	/// charset->pcre_tables
-	Hash CTYPE;	
-
 	/// stack trace
 	Stack trace;
 
@@ -217,12 +221,13 @@ private: // compile.C
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, 
-		const Method& method, bool return_cstr=true);
-	const String *execute_virtual_method(Value& aself, 
-		const String& method_name, bool return_cstr=true);
+	const String *execute_method(Value& aself, const Method& method,
+		bool return_cstr);
+	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
+	const String *execute_virtual_method(Value& aself, const String& method_name);
 	const String *execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name, bool return_cstr=true);
+		const String& method_name,
+		bool return_cstr);
 
 	Value *get_element();