--- parser3/src/classes/op.C	2016/09/29 18:49:42	1.234
+++ parser3/src/classes/op.C	2016/10/11 19:56:41	1.239
@@ -18,11 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.234 2016/09/29 18:49:42 moko Exp $";
-
-// limits
-
-#define MAX_LOOPS 20000
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.239 2016/10/11 19:56:41 moko Exp $";
 
 // defines
 
@@ -90,14 +86,14 @@ static void _if(Request& r, MethodParams
 	do {
 		bool condition=params.as_bool(i, "condition must be expression", r);
 		if(condition) {
-			r.process_write(*params.get(i+1));
+			r.process_write(params[i+1]);
 			return;
 		}
 		i+=2;
 	} while (i < max_param);
 
 	if(i == max_param)
-		r.process_write(*params.get(i));
+		r.process_write(params[i]);
 }
 
 String::Language get_untaint_lang(const String& lang_name){
@@ -196,7 +192,7 @@ static void _process(Request& r, MethodP
 						line_no_alias_offset=value->as_int();
 					} else if(key == "replace") {
 						valid_options++;
-						allow_class_replace=r.process_to_value(*value).as_bool();
+						allow_class_replace=r.process(*value).as_bool();
 					}
 				}
 
@@ -244,12 +240,10 @@ static void _while(Request& r, MethodPar
 	if(delim_maybe_code){ // delimiter set
 		bool need_delim=false;
 		while(true) {
-			if(++endless_loop_count>=MAX_LOOPS) // endless loop?
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"endless loop detected");
+			if(++endless_loop_count>=pa_loop_limit) // endless loop?
+				throw Exception(PARSER_RUNTIME, 0, "endless loop detected");
 
-			if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool())
+			if(!r.process(vcondition).as_bool())
 				break;
 
 			Value& sv_processed=r.process(body_code);
@@ -269,12 +263,10 @@ static void _while(Request& r, MethodPar
 		}
 	} else {
 		while(true) {
-			if(++endless_loop_count>=MAX_LOOPS) // endless loop?
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"endless loop detected");
+			if(++endless_loop_count>=pa_loop_limit) // endless loop?
+				throw Exception(PARSER_RUNTIME, 0, "endless loop detected");
 
-			if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool())
+			if(!r.process(vcondition).as_bool())
 				break;
 
 			r.process_write(body_code);
@@ -301,7 +293,7 @@ static void _use(Request& r, MethodParam
 
 				if(key == "replace") {
 					valid_options++;
-					allow_class_replace=r.process_to_value(*value).as_bool();
+					allow_class_replace=r.process(*value).as_bool();
 				}
 
 			if(valid_options!=options->count())
@@ -338,10 +330,8 @@ static void _for(Request& r, MethodParam
 	Value& body_code=params.as_junction(3, "body must be code");
 	Value* delim_maybe_code=params.count()>4?&params[4]:0;
 
-	if(to-from>=MAX_LOOPS) // too long loop?
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"endless loop detected");
+	if(to-from>=pa_loop_limit) // too long loop?
+		throw Exception(PARSER_RUNTIME, 0, "endless loop detected");
 
 	VInt* vint=new VInt(0);
 
@@ -384,8 +374,7 @@ static void _for(Request& r, MethodParam
 static void _eval(Request& r, MethodParams& params) {
 	Value& expr=params.as_junction(0, "need expression");
 	// evaluate expresion
-	Value& value_result=r.process_to_value(expr, 
-		false/*don't intercept string*/).as_expr_result();
+	Value& value_result=r.process(expr).as_expr_result();
 	if(params.count()>1) {
 		const String& fmt=params.as_string(1, "fmt must be string").trim();
 		if(fmt.is_empty()){
@@ -454,13 +443,13 @@ public:
 };
 #endif
 static void _switch(Request& r, MethodParams& params) {
-	Switch_data* data=new Switch_data(r, r.process_to_value(params[0]));
+	Switch_data* data=new Switch_data(r, r.process(params[0]));
 	Temp_hash_value<HashString<void*>, void*> switch_data_setter(&r.classes_conf, switch_data_name, data);
 
 	Value& cases_code=params.as_junction(1, "switch cases must be code");
 	// execution of found ^case[...]{code} must be in context of ^switch[...]{code}
 	// because of stacked WWrapper used there as wcontext
-	r.process(cases_code, true/*intercept_string*/);
+	r.process(cases_code);
 	if(Value* selected_code=data->found? data->found: data->_default)
 		r.write_pass_lang(r.process(*selected_code));
 }
@@ -487,7 +476,7 @@ static void _case(Request& r, MethodPara
 #endif
 	
 	for(int i=0; i<count; i++){
-		Value& value=r.process_to_value(params[i]);
+		Value& value=r.process(params[i]);
 
 		if(value.is_string() && value.as_string() == CASE_DEFAULT_VALUE){
 			data->_default=code;
@@ -947,7 +936,7 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL
 	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);
+	add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1);
 
 	// ^eval(expr)
 	// ^eval(expr)[format]