--- parser3/src/classes/op.C	2015/09/22 23:37:44	1.221
+++ parser3/src/classes/op.C	2016/04/17 20:20:48	1.227
@@ -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.221 2015/09/22 23:37:44 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.227 2016/04/17 20:20:48 moko Exp $";
 
 // limits
 
@@ -61,8 +61,7 @@ static const String exception_var_name(E
 class Untaint_lang_name2enum: public HashString<String::Language> {
 public:
 	Untaint_lang_name2enum() {
-		#define ULN(name, LANG) \
-			put(String::Body(name), (value_type)(String::L_##LANG));
+		#define ULN(name, LANG) put(name, (value_type)(String::L_##LANG));
 		ULN("clean", CLEAN);
 		ULN("as-is", AS_IS);
 		ULN("optimized-as-is", AS_IS|String::L_OPTIMIZE_BIT);
@@ -325,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) {
@@ -585,6 +581,10 @@ static Try_catch_result try_catch(Reques
 	return result;
 }
 
+static StringOrValue process_try_body_code(Request& r, Value* body_code) {
+	return r.process(*body_code);
+}
+
 // cache--
 
 // consts
@@ -812,15 +812,16 @@ static void _cache(Request& r, MethodPar
 		cache_delete(file_spec);
 	}
 	
-	// process without cacheing
-	const String& processed_body=r.process_to_string(body_code);
-	// write it out 
-	r.write_assign_lang(processed_body);
+	// process without caching
+	if(catch_code){
+		Try_catch_result result=try_catch(r, process_try_body_code, &body_code, catch_code);
+		r.write_assign_lang(result.processed_code);
+	} else {
+		const String& processed_body=r.process_to_string(body_code);
+		r.write_assign_lang(processed_body);
+	}
 }
 
-static StringOrValue process_try_body_code(Request& r, Value* body_code) {
-	return r.process(*body_code);
-}
 static void _try_operator(Request& r, MethodParams& params) {
 	Value& body_code=params.as_junction(0, "body_code must be code");
 	Value& catch_code=params.as_junction(1, "catch_code must be code");
@@ -829,13 +830,7 @@ static void _try_operator(Request& r, Me
 	Try_catch_result result;
 	StringOrValue finally_result;
 	try{
-		result=try_catch(r, 
-			process_try_body_code, &body_code,
-			&catch_code);
-		if(result.exception_should_be_handled)
-			throw Exception(PARSER_RUNTIME,
-				result.exception_should_be_handled,
-				"catch block must set $exception.handled to some boolean value, not string");
+		result=try_catch(r, process_try_body_code, &body_code, &catch_code);
 	} catch(...){
 		if(finally_code)
 			finally_result=r.process(*finally_code);
@@ -896,8 +891,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[]
@@ -932,10 +926,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);