--- parser3/src/classes/op.C	2008/05/26 14:23:46	1.178
+++ parser3/src/classes/op.C	2008/07/08 13:37:30	1.181
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2008/05/26 14:23:46 $";
+static const char * const IDENT_OP_C="$Date: 2008/07/08 13:37:30 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -374,7 +374,8 @@ gettimeofday(&mt[0],NULL);
 	// connect
 	SQL_Connection* connection=SQL_driver_manager->get_connection(url.as_string(), 
 		protocol2driver_and_client,
-		r.charsets.source().NAME().cstr());
+		r.charsets.source().NAME().cstr(),
+		r.request_info.document_root);
 
 #ifdef RESOURCES_DEBUG
 //measure:after connect
@@ -403,12 +404,22 @@ r.sql_connect_time+=t[1]-t[0];
 class Switch_data: public PA_Object {
 public:
 	Request& r;
-	Value& searching;
+	const String* searching_string;
+	double searching_double;
 	Value* found;
 	Value* _default;
 public:
 	Switch_data(Request& ar, Value& asearching): 
-	  r(ar), searching(asearching) {}
+		r(ar)
+	{
+		if(asearching.is_string() || asearching.is_void()){
+			searching_string=&asearching.as_string();
+			searching_double=0;
+		} else {
+			searching_string=0;
+			searching_double=asearching.as_double();
+		}
+	}
 };
 #endif
 static void _switch(Request& r, MethodParams& params) {
@@ -431,31 +442,27 @@ static void _case(Request& r, MethodPara
 			0,
 			"without switch");
 
+	if(data->found) // matches already was found
+		return;
+
 	int count=params.count();
 	Value& code=params.as_junction(--count, "case result must be code");
 	
-	Value& searching=data->searching;
-	bool we_are_searching_string_or_void=searching.is_string() || searching.is_void();
-	for(int i=0; i<count; i++) {
+	for(int i=0; i<count; i++){
 		Value& value=r.process_to_value(params[i]);
 
-		if(value.is_string() && value.as_string() == CASE_DEFAULT_VALUE) {
+		if(value.is_string() && value.as_string() == CASE_DEFAULT_VALUE){
 			data->_default=&code;
-			break;
+			continue;
 		}
 
 		bool matches;
-		if(we_are_searching_string_or_void)
-			matches=searching.as_string() == value.as_string();
+		if(data->searching_string)
+			matches=(*data->searching_string) == value.as_string();
 		else
-			matches=searching.as_double() == value.as_double();
-
-		if(matches) {
-			if(data->found)
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"duplicate found");
+			matches=data->searching_double == value.as_double();
 
+		if(matches){
 			data->found=&code;
 			break;
 		}
@@ -474,9 +481,11 @@ struct Try_catch_result {
 template<class I>
 static Try_catch_result try_catch(Request& r, 
 		  StringOrValue body_code(Request&, I), I info, 
-		  Value* catch_code, bool could_be_handled_by_caller=false) 
+		  Value* catch_code,
+		  bool could_be_handled_by_caller=false) 
 {
 	Try_catch_result result;
+
 	if(!catch_code) {
 		result.processed_code=body_code(r, info);
 		return result;
@@ -496,6 +505,7 @@ static Try_catch_result try_catch(Reques
 		Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false);
 		VMethodFrame& frame=*junction->method_frame;
 		frame.put_element(frame, exception_var_name, &details.vhash, false);
+
 		result.processed_code=r.process(*catch_code);
 		
 		// retriving $exception.handled, restoring $exception var
@@ -512,7 +522,7 @@ static Try_catch_result try_catch(Reques
 				
 				bhandled=false;
 			} else
-				bhandled=vhandled->as_bool();		
+				bhandled=vhandled->as_bool();
 		}
 
 		if(!bhandled) {
@@ -520,6 +530,7 @@ static Try_catch_result try_catch(Reques
 			rethrow;
 		}
 	}
+
 	return result;
 }
 
@@ -765,18 +776,33 @@ static StringOrValue process_try_body_co
 static void _try_operator(Request& r, MethodParams& params) {
 	Value& body_code=params.as_junction(0, "body_code must be code");
 	Value& catch_code=params.as_junction(1, "catch_code must be code");
+	Value* finally_code=(params.count()==3) ? &params.as_junction(2, "finally_code must be code") : 0;
 
-	Try_catch_result result=try_catch(r, 
-		process_try_body_code, &body_code,
-		&catch_code);
-	
-	if(result.exception_should_be_handled)
-		throw Exception(PARSER_RUNTIME,
-			result.exception_should_be_handled,
-			"catch block must set $exception.handled to some boolean value, not string");
+	Try_catch_result result;
+	StringOrValue finally_result;
+	try{
+		result=try_catch(r, 
+			process_try_body_code, &body_code,
+			&catch_code);
+		if(result.exception_should_be_handled)
+			throw Exception(PARSER_RUNTIME,
+				result.exception_should_be_handled,
+				"catch block must set $exception.handled to some boolean value, not string");
+	} catch(...){
+		if(finally_code)
+			finally_result=r.process(*finally_code);
+		rethrow;
+	}
+
+	if(finally_code)
+		finally_result=r.process(*finally_code);
 
 	// write out processed body_code or catch_code
 	r.write_pass_lang(result.processed_code);
+
+	// write out processed finally code
+	if(finally_code)
+		r.write_pass_lang(finally_result);
 }
 
 static void _throw_operator(Request&, MethodParams& params) {
@@ -882,7 +908,7 @@ VClassMAIN::VClassMAIN(): VClass() {
 	// try-catch
 
 	// ^try{code}{catch code}
-	add_native_method("try", Method::CT_ANY, _try_operator, 2, 2);
+	add_native_method("try", Method::CT_ANY, _try_operator, 2, 3);
 	// ^throw[$exception hash]
 	// ^throw[type;source;comment]
 	add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3);