--- parser3/src/include/pa_request.h	2001/04/28 13:25:01	1.87
+++ parser3/src/include/pa_request.h	2001/07/13 12:13:50	1.92
@@ -5,12 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.87 2001/04/28 13:25:01 paf Exp $
+	$Id: pa_request.h,v 1.92 2001/07/13 12:13:50 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"
@@ -20,6 +21,7 @@
 #include "pa_vobject.h"
 #include "pa_venv.h"
 #include "pa_vform.h"
+#include "pa_vmath.h"
 #include "pa_vrequest.h"
 #include "pa_vresponse.h"
 #include "pa_vcookie.h"
@@ -86,7 +88,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(
@@ -151,6 +153,8 @@ public:
 	VEnv env;
 	/// $form:elements
 	VForm form;
+	/// $math:constants
+	VMath math;
 	/// $request:elements
 	VRequest request;
 	/// $response:elements
@@ -177,25 +181,32 @@ public:
 
 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);
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, const Method& method, 
-		bool return_cstr=true);
-	const String *execute_method(Value& aself, const String& method_name, 
-		bool return_cstr=true);
+	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_nonvirtual_method(VStateless_class& aself, 
+		const String& method_name, bool return_cstr=true);
 
 	Value *get_element();
 
@@ -243,4 +254,64 @@ public:
 	}
 };
 
+/**
+	@b method parameters passed in this array.
+	contains handy typecast ad junction/not junction ensurers
+
+*/
+class MethodParams : public Array {
+public:
+	MethodParams(Pool& pool, const String& amethod_name) : Array(pool),
+		fmethod_name(amethod_name) {
+	}
+
+	/// handy typecast. I long for templates
+	Value& get(int index) { 
+		return *static_cast<Value *>(Array::get(index)); 
+	}
+	/// handy is-value-a-junction ensurer
+	Value& as_junction(int index, const char *msg) { 
+		return get_as(index, true, msg); 
+	}
+	/// handy value-is-not-a-junction ensurer
+	Value& as_no_junction(int index, const char *msg) { 
+		return get_as(index, false, msg); 
+	}
+	/// handy expression auto-processing to double
+	double as_double(int index, Request& r) { 
+		return get_processed(index, r).as_double(); 
+	}
+	/// handy expression auto-processing to int
+	int as_int(int index, Request& r) { 
+		return get_processed(index, r).as_int(); 
+	}
+	/// handy string ensurer
+	const String& as_string(int index, const char *msg) { 
+		return as_no_junction(index, msg).as_string(); 
+	}
+
+private:
+
+	/// handy value-is/not-a-junction ensurer
+	Value& get_as(int index, bool as_junction, const char *msg) { 
+		Value& result=get(index);
+		if((result.get_junction()!=0) ^ as_junction)
+			THROW(0, 0,
+				&fmethod_name,
+				"%s (parameter #%d)", msg, 1+index);
+		return result;
+	}
+
+	Value& get_processed(int index, Request& r) {
+		return r.process(get(index),
+			0/*no name*/,
+			false/*don't intercept string*/);
+	}
+
+private:
+
+	const String& fmethod_name;
+
+};
+
 #endif