--- parser3/src/classes/op.C	2015/10/09 11:42:38	1.223
+++ 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.223 2015/10/09 11:42:38 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.227 2016/04/17 20:20:48 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) {
@@ -894,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[]
@@ -930,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);