--- parser3/src/classes/op.C	2016/05/11 16:41:55	1.228
+++ parser3/src/classes/op.C	2016/09/14 14:02:21	1.231
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.228 2016/05/11 16:41:55 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.231 2016/09/14 14:02:21 moko Exp $";
 
 // limits
 
@@ -168,8 +168,6 @@ static void _process(Request& r, MethodP
 		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);
-		// temporary zero @auto so it wouldn't be auto-called in Request::use_buf
-		Temp_method temp_method_auto(*target_class, auto_method_name, 0);
 
 		const String* main_alias=0;
 		const String* file_alias=0;
@@ -522,6 +520,20 @@ struct Try_catch_result {
 
 	Try_catch_result(): exception_should_be_handled(0) {}
 };
+
+/// Auto-object used for temporary changing Request::skip.
+class Temp_skip {
+	Request& frequest;
+	Request::Skip saved_skip;
+public:
+	Temp_skip(Request& arequest) : frequest(arequest), saved_skip(arequest.get_skip()) {
+		arequest.set_skip(Request::SKIP_NOTHING);
+	}
+	~Temp_skip() {
+		if(frequest.get_skip() == Request::SKIP_NOTHING)
+			frequest.set_skip(saved_skip);
+	}
+};
 #endif
 
 /// used by ^try and ^cache, @returns $exception.handled[string] if any
@@ -540,11 +552,15 @@ 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); // remembering exception stack trace
+
 		Request::Exception_details details=r.get_details(e);
+
 		try_context.restore(); // restoring try-context for code after try and catch-code
 
 		{
 			Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details.vhash);
+			Temp_skip temp_skip(r);
 			result.processed_code=r.process(*catch_code);
 		}
 		
@@ -561,8 +577,10 @@ static Try_catch_result try_catch(Reques
 				bhandled=vhandled->as_bool();
 		}
 
-		if(!bhandled)
+		if(!bhandled){
+			throw_context.restore(); // restoring exception stack trace creared by try_context.restore()
 			rethrow;
+		}
 	}
 
 	return result;
@@ -676,12 +694,14 @@ const String* locked_process_and_cache_p
 		cache_delete(file_spec);
 	return result;
 }
+
 #ifndef DOXYGEN
 struct Cache_get_result {
 	const String* body;
 	bool expired;
 };
 #endif
+
 static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) {
 	Cache_get_result result={0, false};
 
@@ -718,9 +738,11 @@ static time_t as_expires(Request& r, Met
 	
 	return result;
 }
+
 static const String& as_file_spec(Request& r, MethodParams& params, int index) {
 	return r.absolute(params.as_string(index, "filespec must be string"));
 }
+
 static void _cache(Request& r, MethodParams& params) {
 	if(params.count()==0) {
 		// ^cache[] -- return current expiration time
@@ -816,16 +838,26 @@ static void _try_operator(Request& r, Me
 
 	Try_catch_result result;
 	StringOrValue finally_result;
+
 	try{
+		// process try and catch code
 		result=try_catch(r, process_try_body_code, &body_code, &catch_code);
 	} catch(...){
-		if(finally_code)
+		// process finally code but ignore the result
+		if(finally_code){
+			Temp_skip temp(r);
 			finally_result=r.process(*finally_code);
+		}
 		rethrow;
 	}
 
-	if(finally_code)
+	// process finally code
+	if(finally_code){
+		Temp_skip temp(r);
 		finally_result=r.process(*finally_code);
+	}
+
+	// no exception in try, catch or finally, writing the result
 
 	// write out processed body_code or catch_code
 	r.write_pass_lang(result.processed_code);