--- parser3/src/classes/op.C	2016/11/29 15:28:05	1.248
+++ parser3/src/classes/op.C	2019/11/22 23:11:24	1.253
@@ -1,7 +1,7 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.248 2016/11/29 15:28:05 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.253 2019/11/22 23:11:24 moko Exp $";
 
 // defines
 
@@ -248,7 +248,7 @@ static void _while(Request& r, MethodPar
 				break;
 
 			Value& sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
@@ -259,7 +259,7 @@ static void _while(Request& r, MethodPar
 			}
 			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -271,9 +271,8 @@ static void _while(Request& r, MethodPar
 				break;
 
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}
@@ -331,6 +330,13 @@ static void _continue(Request& r, Method
 	if(!params.count() || params.as_bool(0, "condition must be expression", r)) set_skip(r, Request::SKIP_CONTINUE);
 }
 
+static void _return(Request& r, MethodParams& params) {
+	VMethodFrame& caller=*r.get_method_frame()->caller();
+	if(params.count())
+		r.put_element(caller, Symbols::RESULT_SYMBOL, &params[0]);
+	r.set_skip_return(caller);
+}
+
 static void _for(Request& r, MethodParams& params) {
 	InCycle temp(r);
 
@@ -354,7 +360,7 @@ static void _for(Request& r, MethodParam
 			vint->set_int(i);
 
 			Value& sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
@@ -365,7 +371,7 @@ static void _for(Request& r, MethodParam
 			}
 			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -373,9 +379,8 @@ static void _for(Request& r, MethodParam
 			vint->set_int(i);
  
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}
@@ -699,20 +704,13 @@ struct Cache_get_result {
 static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) {
 	Cache_get_result result={0, false};
 
-	File_read_result file=file_read(charsets, file_spec, 
-			   false/*as_text*/, 
-			   0, //no params
-			   false/*fail_on_read_problem*/);
-	if(file.success && file.length/* ignore reads which are empty due to 
-			non-unary open+lockEX conflict with lockSH */) {
-			
-		Data_string_serialized_prolog& prolog=
-			*reinterpret_cast<Data_string_serialized_prolog *>(file.str);
-
+	File_read_result file=file_read_binary(file_spec, false /*fail_on_read_problem*/);
+	if(file.success && file.length /*ignore reads which are empty due to non-unary open+lockEX conflict with lockSH*/) {
+		
+		Data_string_serialized_prolog& prolog = *reinterpret_cast<Data_string_serialized_prolog *>(file.str);
+		
 		String* body=new String;
-		if(
-			file.length>=sizeof(Data_string_serialized_prolog)
-			&& prolog.version==DATA_STRING_SERIALIZED_VERSION) {
+		if(file.length>=sizeof(Data_string_serialized_prolog) && prolog.version==DATA_STRING_SERIALIZED_VERSION) {
 			if(body->deserialize(sizeof(Data_string_serialized_prolog),  file.str, file.length)) {
 				result.body=body;
 				result.expired=prolog.expires <= now;
@@ -722,8 +720,8 @@ static Cache_get_result cache_get(Reques
 
 	return result;
 }
-static time_t as_expires(Request& r, MethodParams& params, 
-						int index, time_t now) {
+
+static time_t as_expires(Request& r, MethodParams& params, int index, time_t now) {
 	time_t result;
 	if(Value* vdate=params[index].as(VDATE_TYPE))
 		result=(time_t)(static_cast<VDate*>(vdate)->get_time());
@@ -945,6 +943,10 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL
 	// ^continue(condition)
 	add_native_method("continue", Method::CT_ANY, _continue, 0, 1, Method::CO_WITHOUT_FRAME);
 
+	// ^return[]
+	// ^return[result]
+	add_native_method("return", Method::CT_ANY, _return, 0, 1);
+
 	// ^for[i](from-number;to-number-inclusive){code}[delim]
 	add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1);