--- parser3/src/include/pa_request.h	2009/05/04 09:26:08	1.192
+++ parser3/src/include/pa_request.h	2010/05/25 03:58:17	1.201
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2009/05/04 09:26:08 $";
+static const char * const IDENT_REQUEST_H="$Date: 2010/05/25 03:58:17 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -118,10 +118,11 @@ private:
 	///@{ core data
 
 	/// classes
-	HashStringValue fclasses;
+	HashString<Value*> fclasses;
 
 	/// already used files to avoid cyclic uses
-	Hash<const String::Body, bool> used_files;
+	HashString<bool> used_files;
+	HashString<bool> searched_along_class_path;
 	/// list of all used files, Operation::file_no = index to it
 	Array<String::Body> file_list;
 
@@ -152,6 +153,7 @@ public:
 	/// interrupted flag, raised on signals [SIGPIPE]
 	bool finterrupted;
 	Skip fskip;
+	int fin_cycle;
 
 public:
 	uint register_file(String::Body file_spec);
@@ -187,7 +189,8 @@ public:
 	~Request();
 
 	/// global classes
-	HashStringValue& classes() { return fclasses; }
+	HashString<Value*>& classes() { return fclasses; }
+	Value* get_class(const String& name);
 
 	/**
 		core request processing
@@ -203,6 +206,7 @@ public:
 	void execute(ArrayOperation& ops); // execute.C
 	void op_call(VMethodFrame &frame);
 	void op_call_write(VMethodFrame &frame);
+	void op_call(VMethodFrame &frame, bool constructing);
 	/// execute ops with anti-recoursion check
 	void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {
 		// anti_endless_execute_recoursion
@@ -216,19 +220,23 @@ public:
 		anti_endless_execute_recoursion--;
 	}
 
+	///
+	void use_file_directly(VStateless_class& aclass,
+				const String& file_spec,
+				bool fail_on_read_problem=true, 
+				bool fail_on_file_absence=true);
+				
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
 	void use_file(VStateless_class& aclass,
-		const String& file_name, 
-		const String* main_alias=0,
-		bool ignore_class_path=false, 
-		bool fail_on_read_problem=true, 
-		bool fail_on_file_absence=true); // pa_request.C
+		const String& file_name,
+		const String* use_filespec);
+
 	/// compiles a @a source buffer
 	void use_buf(VStateless_class& aclass,
 		const char* source, 
 		const String* main_alias,
 		uint file_no,
-		int line_no_offset=0); // pa_request.C
+		int line_no_offset=0);
 
 	/// processes any code-junction there may be inside of @a value
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
@@ -241,7 +249,8 @@ public:
 		return process(input_value, intercept_string).as_value();
 	}
 	//@}
-
+	const String* get_method_filename(const Method* method); // execute.C
+	const String* get_used_filename(uint file_no);
 	
 #define DEFINE_DUAL(modification) \
 	void write_##modification##_lang(StringOrValue dual) { \
@@ -310,6 +319,9 @@ public:
 	void set_skip(Skip askip) { fskip=askip; }
 	Skip get_skip() { return fskip; }
 
+	void set_in_cycle(int adelta) { fin_cycle+=adelta; }
+	bool get_in_cycle() { return fin_cycle>0; }
+
 public:
 	
 	/// info from web server
@@ -335,7 +347,7 @@ public:
 	VConsole& console;
 
 	/// classes configured data
-	Hash<const String::Body, void*> classes_conf;
+	HashString<void*> classes_conf;
 
 public: // status read methods
 
@@ -510,15 +522,20 @@ public:
 	}
 };
 
+///	Auto-object used for break out of cycle check
+class InCycle {
+	Request& frequest;
+public:
+	InCycle(Request& arequest) : frequest(arequest) {
+		frequest.set_in_cycle(1);
+	}
+	~InCycle() { 
+		frequest.set_in_cycle(-1);
+	}
+};
 
 // defines for externs
 
-#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding"
-#define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_ATTACHMENT "attachment"
-#define CONTENT_DISPOSITION_INLINE "inline"
-#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
-
 #define EXCEPTION_HANDLED_PART_NAME "handled"
 
 
@@ -528,12 +545,6 @@ extern const String main_method_name;
 extern const String auto_method_name;
 extern const String body_name;
 
-extern const String content_transfer_encoding_name;
-extern const String content_disposition_name;
-extern const String content_disposition_attachment;
-extern const String content_disposition_inline;
-extern const String content_disposition_filename_name;
-
 extern const String exception_type_part_name;
 extern const String exception_source_part_name;
 extern const String exception_comment_part_name;