--- parser3/src/classes/op.C	2016/10/11 19:56:41	1.239
+++ parser3/src/classes/op.C	2017/01/13 13:50:28	1.249
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.239 2016/10/11 19:56:41 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.249 2017/01/13 13:50:28 moko Exp $";
 
 // defines
 
@@ -106,17 +106,19 @@ String::Language get_untaint_lang(const
 static void _untaint(Request& r, MethodParams& params) {
 	String::Language lang;
 	if(params.count()==1)
-		lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql 
+		lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql
 	else
 		lang=get_untaint_lang(params.as_string(0, "lang must be string"));
 
-	{
-		Value& vbody=params.as_junction(params.count()-1, "body must be code");
-		
-		Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language;
-		Value& result=r.process(vbody); // process marking tainted with that lang
-		r.write_assign_lang(result);
-	}
+	Value& vbody=params.as_junction(params.count()-1, "body must be code");
+	Value& result=r.process(vbody);
+
+	if(const String* string=result.get_string()){
+		String &untainted=*new String();
+		string->append_to(untainted, lang); // mark all tainted to specified language
+		r.write(untainted);
+	} else
+		r.write(result); // this is not normal, just backward compatibility
 }
 
 static void _taint(Request& r, MethodParams& params) {
@@ -130,7 +132,7 @@ static void _taint(Request& r, MethodPar
 		Value& vbody=params.as_no_junction(params.count()-1, "body must not be code");
 		
 		String result(vbody.as_string(), lang); // force result language to specified
-		r.write_assign_lang(result);
+		r.write(result);
 	}
 }
 
@@ -138,7 +140,7 @@ static void _apply_taint(Request& r, Met
 	String::Language lang=params.count()==1 ? String::L_AS_IS : get_untaint_lang(params.as_string(0, "lang must be string"));
 	const String &sbody=params.as_string(params.count()-1, "body must be string");
 	String::Body result_body=sbody.cstr_to_string_body_untaint(lang, r.connection(false), &r.charsets);
-	r.write_pass_lang(*new String(result_body, String::L_AS_IS));
+	r.write(*new String(result_body, String::L_AS_IS));
 }
 
 static void _process(Request& r, MethodParams& params) {
@@ -161,8 +163,6 @@ static void _process(Request& r, MethodP
 		if(!target_class)
 			throw Exception(PARSER_RUNTIME, 0, "no target class");
 
-		// temporary remove language change
-		Temp_lang temp_lang(r, String::L_PARSER_CODE);
 		// temporary zero @main so to maybe-replace it in processed code
 		Temp_method temp_method_main(*target_class, main_method_name, 0);
 
@@ -208,7 +208,7 @@ static void _process(Request& r, MethodP
 
 		Temp_class_replace class_replace(r, allow_class_replace);
 
-		r.use_buf(*target_class, source.untaint_cstr(String::L_AS_IS, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset);
+		r.use_buf(*target_class, source.untaint_cstr(String::L_PARSER_CODE, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset);
 
 		// main_method
 		main_method=target_class->get_method(main_method_name);
@@ -216,10 +216,11 @@ static void _process(Request& r, MethodP
 	// after restoring current-request-lang
 	// maybe-execute @main[]
 	if(main_method) {
-		VMethodFrame frame(*main_method, r.get_method_frame()->caller(), *target_self);
-		frame.empty_params();
-		r.op_call(frame);
-		r.write_pass_lang(frame.result());
+		METHOD_FRAME_ACTION(*main_method, r.get_method_frame()->caller(), *target_self, {
+			frame.empty_params();
+			r.call(frame);
+			r.write(frame.result());
+		});
 	}
 }
 	
@@ -247,18 +248,18 @@ 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
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -270,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;
 		}
 	}
@@ -282,6 +282,7 @@ static void _use(Request& r, MethodParam
 	Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE);
 
 	bool allow_class_replace=false;
+	const String* use_origin=0;
 
 	if(params.count()==2)
 		if(HashStringValue* options=params.as_hash(1)) {
@@ -296,15 +297,23 @@ static void _use(Request& r, MethodParam
 					allow_class_replace=r.process(*value).as_bool();
 				}
 
-			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+				if(key == "origin") {
+					valid_options++;
+					use_origin=&value->as_string();
+				}
+
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
 		}
 
+	if(!use_origin)
+		if(VMethodFrame* caller=r.get_method_frame()->caller())
+			use_origin=r.get_method_filespec(&caller->method);
+
 	Temp_class_replace class_replace(r, allow_class_replace);
 
-	// _use could be called from the parser3 method only, so caller is always defined
-	r.use_file(r.main_class, vfile.as_string(), r.get_method_filename(&r.get_method_frame()->caller()->method));
+	r.use_file(r.main_class, vfile.as_string(), use_origin);
 }
 
 static void set_skip(Request& r, Request::Skip askip) {
@@ -321,6 +330,12 @@ 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) {
+	if(params.count())
+		r.put_element(*r.get_method_frame(), Symbols::RESULT_SYMBOL, &params[0]); // not caller as CO_WITHOUT_FRAME
+	r.set_skip_return();
+}
+
 static void _for(Request& r, MethodParams& params) {
 	InCycle temp(r);
 
@@ -344,18 +359,18 @@ 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
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -363,9 +378,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;
 		}
 	}
@@ -378,12 +392,12 @@ static void _eval(Request& r, MethodPara
 	if(params.count()>1) {
 		const String& fmt=params.as_string(1, "fmt must be string").trim();
 		if(fmt.is_empty()){
-			r.write_no_lang(value_result);
+			r.write(value_result);
 		} else {
-			r.write_no_lang(String(format(value_result.as_double(), fmt.cstrm())));
+			r.write(String(format(value_result.as_double(), fmt.cstrm())));
 		}
 	} else
-		r.write_no_lang(value_result);
+		r.write(value_result);
 }
 
 static void _connect(Request& r, MethodParams& params) {
@@ -451,7 +465,7 @@ static void _switch(Request& r, MethodPa
 	// because of stacked WWrapper used there as wcontext
 	r.process(cases_code);
 	if(Value* selected_code=data->found? data->found: data->_default)
-		r.write_pass_lang(r.process(*selected_code));
+		r.process_write(*selected_code);
 }
 
 static void _case(Request& r, MethodParams& params) {
@@ -733,7 +747,7 @@ static void _cache(Request& r, MethodPar
 		Cache_scope* scope=static_cast<Cache_scope*>(r.classes_conf.get(cache_data_name));
 		if(!scope)
 			throw Exception(PARSER_RUNTIME, 0, "expire-time get without cache");
-		r.write_no_lang(*new VDate((pa_time_t)scope->expires));
+		r.write(*new VDate((pa_time_t)scope->expires));
 		return;
 	}
 
@@ -782,7 +796,7 @@ static void _cache(Request& r, MethodPar
 				scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[]
 			} else {
 				// and it's not expired yet write it out 
-   				r.write_assign_lang(*cached.body);
+   				r.write(*cached.body);
    				// happy with it
    				return;
    			}
@@ -794,7 +808,7 @@ static void _cache(Request& r, MethodPar
 		const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec);
 		if(processed_body){
 			// write it out 
-			r.write_assign_lang(*processed_body);
+			r.write(*processed_body);
 			// happy with it
 			return;
 		} else {
@@ -808,9 +822,9 @@ static void _cache(Request& r, MethodPar
 	// 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);
+		r.write(result.processed_code);
 	} else {
-		r.write_assign_lang(r.process_to_string(body_code));
+		r.write(r.process_to_string(body_code));
 	}
 }
 
@@ -828,7 +842,7 @@ static void _try_operator(Request& r, Me
 		// process finally code but ignore the result
 		if(finally_code){
 			Temp_skip temp(r);
-			Value &finally_result=r.process(*finally_code);
+			/* Value &finally_result= */ r.process(*finally_code);
 		}
 		rethrow;
 	}
@@ -839,13 +853,13 @@ static void _try_operator(Request& r, Me
 		Value& finally_result=r.process(*finally_code);
 
 		// no exception in try/catch or finally, writing processed body_code or catch_code
-		r.write_pass_lang(result.processed_code);
+		r.write(result.processed_code);
 
 		// write out processed finally code
-		r.write_pass_lang(finally_result);
+		r.write(finally_result);
 	} else {
 		// no exception in try/catch, writing processed body_code or catch_code
-		r.write_pass_lang(result.processed_code);
+		r.write(result.processed_code);
 	}
 
 }
@@ -935,6 +949,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, 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);