vala r2035 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Wed Nov 19 23:11:08 2008
New Revision: 2035
URL: http://svn.gnome.org/viewvc/vala?rev=2035&view=rev

Log:
2008-11-20  JÃrg Billeter  <j bitron ch>

	* vala/valacatchclause.vala:
	* vala/valaerrortype.vala:

	Correct source file dependencies for catch clauses,
	fixes bug 561437


Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/vala/valacatchclause.vala
   trunk/vala/valaerrortype.vala

Modified: trunk/THANKS
==============================================================================
--- trunk/THANKS	(original)
+++ trunk/THANKS	Wed Nov 19 23:11:08 2008
@@ -64,6 +64,7 @@
 Ross Burton
 Sam Liddicott
 Samuel Cormier-Iijima
+Sebastian DrÃge
 StÃphan Kochen
 Tai Chi Minh Ralph Eastwood
 Thijs Vermeir

Modified: trunk/vala/valacatchclause.vala
==============================================================================
--- trunk/vala/valacatchclause.vala	(original)
+++ trunk/vala/valacatchclause.vala	Wed Nov 19 23:11:08 2008
@@ -103,8 +103,6 @@
 		checked = true;
 
 		if (error_type != null) {
-			analyzer.current_source_file.add_type_dependency (error_type, SourceFileDependencyType.SOURCE);
-
 			error_variable = new LocalVariable (error_type.copy (), variable_name);
 
 			body.scope.add (variable_name, error_variable);
@@ -117,6 +115,8 @@
 
 		error_type.check (analyzer);
 
+		analyzer.current_source_file.add_type_dependency (error_type, SourceFileDependencyType.SOURCE);
+
 		body.check (analyzer);
 
 		return !error;

Modified: trunk/vala/valaerrortype.vala
==============================================================================
--- trunk/vala/valaerrortype.vala	(original)
+++ trunk/vala/valaerrortype.vala	Wed Nov 19 23:11:08 2008
@@ -129,4 +129,11 @@
 	public override bool is_reference_type_or_type_parameter () {
 		return true;
 	}
+
+	public override bool check (SemanticAnalyzer analyzer) {
+		if (error_domain != null) {
+			return error_domain.check (analyzer);
+		}
+		return true;
+	}
 }