--- parser3/src/include/pa_request.h	2016/11/01 23:10:41	1.238
+++ parser3/src/include/pa_request.h	2017/01/17 23:53:28	1.246
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.238 2016/11/01 23:10:41 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.246 2017/01/17 23:53:28 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -35,8 +35,9 @@ class VCookie;
 class VStateless_class;
 class VConsole;
 
-extern int pa_execute_recoursion_limit;
 extern int pa_loop_limit;
+extern int pa_execute_recoursion_limit;
+extern size_t pa_file_size_limit;
 
 /// Main workhorse.
 class Request: public PA_Object {
@@ -64,8 +65,10 @@ public:
 
 	enum Skip {
 		SKIP_NOTHING,
+		SKIP_CONTINUE,
 		SKIP_BREAK,
-		SKIP_CONTINUE
+		SKIP_RETURN,
+		SKIP_INTERRUPTED
 	};
 
 private:
@@ -123,7 +126,7 @@ private:
 	Array<String::Body> file_list;
 
 	/// endless execute(execute(... preventing counter
-	uint anti_endless_execute_recoursion;
+	int anti_endless_execute_recoursion;
 
 	///@}
 
@@ -146,10 +149,12 @@ public:
 	/// current connection
 	SQL_Connection* fconnection;
 	//@}
-	/// interrupted flag, raised on signals [SIGPIPE]
-	bool finterrupted;
-	Skip fskip;
+
+private:
+
 	int fin_cycle;
+	Skip fskip;
+	VMethodFrame* freturn_method_frame;
 
 public:
 	uint register_file(String::Body file_spec);
@@ -192,9 +197,33 @@ public:
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
-	void call(VMethodFrame &frame);
-	void call_expression(VMethodFrame &frame);
-	void call_write(VMethodFrame &frame);
+
+	template<typename Frame> void call(Frame& frame){
+		VMethodFrame *saved_method_frame=method_frame;
+		Value* saved_rcontext=rcontext;
+		WContext *saved_wcontext=wcontext;
+
+		rcontext=wcontext=method_frame=&frame;
+
+		frame.call(*this);
+
+		wcontext=saved_wcontext;
+		rcontext=saved_rcontext;
+		method_frame=saved_method_frame;
+	}
+
+	template<typename Frame> void call_write(Frame& frame){
+		VMethodFrame *saved_method_frame=method_frame;
+		Value* saved_rcontext=rcontext;
+
+		rcontext=method_frame=&frame;
+
+		frame.call(*this);
+
+		rcontext=saved_rcontext;
+		method_frame=saved_method_frame;
+	}
+
 	Value& construct(VStateless_class &class_value, const Method &method);
 
 	/// execute ops with anti-recoursion check
@@ -212,7 +241,9 @@ public:
 
 	/// 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* use_filespec);
-	void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec, Operation::Origin origin);
+
+	/// for @USE only, calls ^use (which may be user-defined)
+	void use_file(const String& file_name, const String* use_filespec, Operation::Origin origin);
 
 	/// 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);
@@ -227,22 +258,22 @@ public:
 		return process(input_value).as_string();
 	}
 	//@}
-	const String* get_method_filename(const Method* method); // execute.C
-	const String* get_used_filename(uint file_no);
+	const String* get_method_filespec(const Method* method); // execute.C
+	const String* get_used_filespec(uint file_no);
 	
 	/// appending string with it's languages
-	void write(const String& astring) {
+	inline void write(const String& astring) {
 		wcontext->write(astring);
 	}
 	
 	/// in [] and {} appending string if get_string is not null, else appending value
-	/// in () allways appending value
-	void write(Value& avalue) {
+	/// in () appending string if is_string, else appending value
+	inline void write(Value& avalue) {
 		wcontext->write_as_string(avalue);
 	}
 
 	/// allways appending value
-	void write_value(Value& avalue) {
+	inline void write_value(Value& avalue) {
 		wcontext->write(avalue);
 	}
 
@@ -265,11 +296,11 @@ public:
 		return fconnection;
 	}
 
-	void set_interrupted(bool ainterrupted) { finterrupted=ainterrupted; }
-	bool get_interrupted() { return finterrupted; }
-
-	void set_skip(Skip askip) { fskip=askip; }
 	Skip get_skip() { return fskip; }
+	void set_skip(Skip askip) { fskip=askip; }
+	void set_skip_return(VMethodFrame& amethod_frame) { fskip=SKIP_RETURN; freturn_method_frame=&amethod_frame; }
+	inline bool check_skip_break() { bool result=fskip >= SKIP_BREAK; if(fskip <= SKIP_BREAK) fskip=SKIP_NOTHING; return result; }
+	inline void check_skip_return() { if(fskip==SKIP_RETURN && method_frame==freturn_method_frame) fskip=SKIP_NOTHING; }
 
 	void set_in_cycle(int adelta) { fin_cycle+=adelta; }
 	bool get_in_cycle() { return fin_cycle>0; }
@@ -314,9 +345,6 @@ public: // status read methods
 	/// for @main[]
 	const String* execute_virtual_method(Value& aself, const String& method_name);
 
-	/// executes parser method, use op_call(frame) to execute native method
-	void execute_method(VMethodFrame& aframe);
-
 	//{ for @conf[filespec] and @auto[filespec] and parser://method/call
 	const String* execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string);
 
@@ -465,6 +493,23 @@ public:
 	}
 };
 
+///	Auto-object used for break out of cycle check
+class TempSkip4Delimiter {
+	Request& frequest;
+	Request::Skip fskip;
+public:
+	TempSkip4Delimiter(Request& arequest) : frequest(arequest), fskip(arequest.get_skip()) {
+		frequest.set_skip(Request::SKIP_NOTHING);
+	}
+	// returns true if break required, should be called
+	bool check_break() {
+		if(frequest.get_skip())
+			fskip=frequest.get_skip();
+		frequest.set_skip(fskip <= Request::SKIP_BREAK ? Request::SKIP_NOTHING : fskip);
+		return fskip >= Request::SKIP_BREAK;
+	}
+};
+
 ///	Auto-object used for temporary changing Request::allow_class_replace.
 class Temp_class_replace {
 	Request& frequest;