--- parser3/src/include/pa_request.h	2002/03/27 13:33:32	1.124
+++ parser3/src/include/pa_request.h	2002/04/15 10:35:22	1.129
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.124 2002/03/27 13:33:32 paf Exp $
+	$Id: pa_request.h,v 1.129 2002/04/15 10:35:22 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -30,6 +30,12 @@
 #include <sys/resource.h>
 #endif
 
+// consts
+
+const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
+
+// defines
+
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
@@ -101,6 +107,18 @@ public:
 
 	/// executes ops
 	void execute(const Array& ops); // execute.C
+	/// execute ops with anti-recoursion check
+	void recoursion_checked_execute(const String *name, const Array& ops) {
+		// anti_endless_execute_recoursion
+		if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
+			anti_endless_execute_recoursion=0; // give @exception a chance
+			throw Exception("parser.runtime",
+				name,
+				"call canceled - endless recursion detected");
+		}
+		execute(ops); // execute it
+		anti_endless_execute_recoursion--;
+	}
 
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
 	VStateless_class *use_file(
@@ -113,12 +131,20 @@ public:
 		const char *source, const char *file,
 		VStateless_class *aclass=0, const String *name=0, 
 		VStateless_class *base_class=0); // core.C
-	/// processes any code-junction there may be inside of @a value
-	Value& process(
-		Value& value, 
-		const String *name=0,
-		bool intercept_string=true); // execute.C
 
+	/// processes any code-junction there may be inside of @a value
+	StringOrValue process(Value& input_value,
+		bool intercept_string,
+		void (*postexecute)(void *info)=0, void *postexecute_info=0); // execute.C
+	//@{ convinient helpers
+	const String& process_to_string(Value& input_value) {
+		return process(input_value, true/*intercept_string*/).as_string();
+	}
+	Value& process_to_value(Value& input_value, bool intercept_string=true) {
+		return process(input_value, intercept_string).as_value();
+	}
+	//@}
+	
 	/// appending, sure of clean string inside
 	void write_no_lang(const String& astring) {
 		wcontext->write(astring, 
@@ -165,7 +191,7 @@ public:
 	/// returns current SQL connection if any
 	SQL_Connection *connection(const String *source) { 
 		if(!fconnection && source)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				source,
 				"outside of 'connect' operator");
 
@@ -284,9 +310,6 @@ private:
 	/// connection
 	SQL_Connection *fconnection;
 
-
-private:
-
 	void output_result(const VFile& body_file, bool header_only);
 };
 
@@ -364,7 +387,7 @@ private:
 	Value& get_as(int index, bool as_junction, const char *msg) { 
 		Value& result=get(index);
 		if((result.get_junction()!=0) ^ as_junction)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&fmethod_name,
 				"%s (parameter #%d)", msg, 1+index);
 
@@ -372,9 +395,7 @@ private:
 	}
 
 	Value& get_processed(int index, const char *msg, Request& r) {
-		return r.process(as_junction(index, msg),
-			0/*no name*/,
-			false/*don't intercept string*/);
+		return r.process_to_value(as_junction(index, msg), 0/*no name*/);
 	}
 
 private: