--- parser3/src/main/execute.C	2003/11/20 15:35:31	1.301
+++ parser3/src/main/execute.C	2004/07/30 10:01:14	1.306
@@ -1,11 +1,11 @@
 /** @file
 	Parser: executor part of request class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2003/11/20 15:35:31 $";
+static const char * const IDENT_EXECUTE_C="$Date: 2004/07/30 10:01:14 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -105,7 +105,7 @@ void debug_dump(SAPI_Info& sapi_info, in
 void Request::execute(ArrayOperation& ops) {
 	register Stack<StackItem>& stack=this->stack; // helps a lot on MSVC: 'esi'
 
-	const String* debug_name=0;  Operation::Origin debug_origin={0};
+	const String* debug_name=0;  Operation::Origin debug_origin={0, 0, 0};
 	try{
 #ifdef DEBUG_EXECUTE
 	debug_printf(sapi_info, "source----------------------------\n");
@@ -812,7 +812,7 @@ void Request::execute(ArrayOperation& op
 				"invalid opcode %d", opcode); 
 		}
 	}
-	} catch(...) {
+	} catch(const Exception&) {
 		// record it to stack trace
 		if(debug_name)
 			exception_trace.push(Trace(debug_name, debug_origin));
@@ -907,7 +907,7 @@ StringOrValue Request::process(Value& in
 			wcontext=&local;
 
 			// execute it
-			recoursion_checked_execute(/*0/*result_name* /, */ *junction->code);
+			recoursion_checked_execute(*junction->code);
 			
 			// CodeFrame soul:
 			//   string writes were intercepted
@@ -919,7 +919,7 @@ StringOrValue Request::process(Value& in
 			wcontext=&local;
 		
 			// execute it
-			recoursion_checked_execute(/*0/*result_name* /, */ *junction->code);
+			recoursion_checked_execute(*junction->code);
 		
 			result=wcontext->result();
 		}