vala r2300 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Jan  9 10:29:02 2009
New Revision: 2300
URL: http://svn.gnome.org/viewvc/vala?rev=2300&view=rev

Log:
2009-01-09  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodemethodmodule.vala:

	Fix error handling in try statements nested across method
	boundaries (using lambda expressions)


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodemethodmodule.vala

Modified: trunk/gobject/valaccodemethodmodule.vala
==============================================================================
--- trunk/gobject/valaccodemethodmodule.vala	(original)
+++ trunk/gobject/valaccodemethodmodule.vala	Fri Jan  9 10:29:02 2009
@@ -63,6 +63,7 @@
 		bool old_method_inner_error = current_method_inner_error;
 		int old_next_temp_var_id = next_temp_var_id;
 		var old_variable_name_map = variable_name_map;
+		var old_try = current_try;
 		if (m.parent_symbol is TypeSymbol) {
 			current_type_symbol = (TypeSymbol) m.parent_symbol;
 		}
@@ -72,6 +73,7 @@
 		current_method_inner_error = false;
 		next_temp_var_id = 0;
 		variable_name_map = new HashMap<string,string> (str_hash, str_equal);
+		current_try = null;
 
 		bool in_gtypeinstance_creation_method = false;
 		bool in_gobject_creation_method = false;
@@ -163,6 +165,7 @@
 		current_method_inner_error = old_method_inner_error;
 		next_temp_var_id = old_next_temp_var_id;
 		variable_name_map = old_variable_name_map;
+		current_try = old_try;
 
 		function = new CCodeFunction (m.get_real_cname (), get_creturn_type (m, creturn_type.get_cname ()));
 		m.ccodenode = function;