--- parser3/src/classes/op.C	2015/10/09 11:42:38	1.223
+++ parser3/src/classes/op.C	2016/05/11 16:41:55	1.228
@@ -1,7 +1,7 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 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.223 2015/10/09 11:42:38 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.228 2016/05/11 16:41:55 moko Exp $";
 
 // limits
 
@@ -324,19 +324,16 @@ static void _use(Request& r, MethodParam
 
 static void set_skip(Request& r, Request::Skip askip) {
 	if(!r.get_in_cycle())
-		throw Exception(askip==Request::SKIP_BREAK?"parser.break":"parser.continue",
-			0,
-			"without cycle");
-
+		throw Exception(askip==Request::SKIP_BREAK ? "parser.break" : "parser.continue", 0, "without cycle");
 	r.set_skip(askip);
 }
 
-static void _break(Request& r, MethodParams&) {
-	set_skip(r, Request::SKIP_BREAK);
+static void _break(Request& r, MethodParams& params) {
+	if(!params.count() || params.as_bool(0, "condition must be expression", r)) set_skip(r, Request::SKIP_BREAK);
 }
 
-static void _continue(Request& r, MethodParams&) {
-	set_skip(r, Request::SKIP_CONTINUE);
+static void _continue(Request& r, MethodParams& params) {
+	if(!params.count() || params.as_bool(0, "condition must be expression", r)) set_skip(r, Request::SKIP_CONTINUE);
 }
 
 static void _for(Request& r, MethodParams& params) {
@@ -529,13 +526,10 @@ struct Try_catch_result {
 
 /// used by ^try and ^cache, @returns $exception.handled[string] if any
 template<class I>
-static Try_catch_result try_catch(Request& r, 
-		  StringOrValue body_code(Request&, I), I info, 
-		  Value* catch_code,
-		  bool could_be_handled_by_caller=false) 
-{
+static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) {
 	Try_catch_result result;
 
+	// minor bug: context not restored if only finally code is present, see #1062
 	if(!catch_code) {
 		result.processed_code=body_code(r, info);
 		return result;
@@ -546,39 +540,29 @@ static Try_catch_result try_catch(Reques
 	try {
 		result.processed_code=body_code(r, info);
 	} catch(const Exception& e) {
-		Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error]
 		Request::Exception_details details=r.get_details(e);
-		try_context.restore(); // restoring try-context to perform catch-code
+		try_context.restore(); // restoring try-context for code after try and catch-code
 
-		Junction* junction=catch_code->get_junction();
-		Value* method_frame=junction->method_frame;
-		Value* saved_exception_var_value=method_frame->get_element(exception_var_name);
-		VMethodFrame& frame=*junction->method_frame;
-		frame.put_element(exception_var_name, &details.vhash);
-
-		result.processed_code=r.process(*catch_code);
+		{
+			Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details.vhash);
+			result.processed_code=r.process(*catch_code);
+		}
 		
-		// retriving $exception.handled, restoring $exception var
+		// retriving $exception.handled
 		Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
-		frame.put_element(exception_var_name, saved_exception_var_value);
 
 		bool bhandled=false;
 		if(vhandled) {
 			if(vhandled->is_string()) { // not simple $exception.handled(1/0)?
-				if(could_be_handled_by_caller) { // and we can possibly handle it
+				if(bhandled=could_be_handled_by_caller) { // and we can possibly handle it
 					result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover
-					return result;
 				}
-				
-				bhandled=false;
 			} else
 				bhandled=vhandled->as_bool();
 		}
 
-		if(!bhandled) {
-			throw_context.restore(); // restoring throw-context [exception were not handled]
+		if(!bhandled)
 			rethrow;
-		}
 	}
 
 	return result;
@@ -894,8 +878,7 @@ static void _bpt(Request&, MethodParams&
 
 // constructor
 
-VClassMAIN::VClassMAIN(): VClass() {
-	set_name(*new String(MAIN_CLASS_NAME));
+VClassMAIN::VClassMAIN(): VClass(MAIN_CLASS_NAME) {
 
 #ifdef PA_BPT
 	// ^bpt[]
@@ -930,10 +913,12 @@ VClassMAIN::VClassMAIN(): VClass() {
 	add_native_method("use", Method::CT_ANY, _use, 1, 2);
 
 	// ^break[]
-	add_native_method("break", Method::CT_ANY, _break, 0, 0, Method::CO_WITHOUT_FRAME);
+	// ^break(condition)
+	add_native_method("break", Method::CT_ANY, _break, 0, 1, Method::CO_WITHOUT_FRAME);
 
 	// ^continue[]
-	add_native_method("continue", Method::CT_ANY, _continue, 0, 0, Method::CO_WITHOUT_FRAME);
+	// ^continue(condition)
+	add_native_method("continue", Method::CT_ANY, _continue, 0, 1, Method::CO_WITHOUT_FRAME);
 
 	// ^for[i](from-number;to-number-inclusive){code}[delim]
 	add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1, Method::CO_WITHOUT_WCONTEXT);