Correct source file dependencies for catch clauses, fixes bug 561437

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

svn path=/trunk/; revision=2035

diff --git a/ChangeLog b/ChangeLog
index 89a28abed258ae579ceb51bc3e3f592548cf231d..df23535ce9b9760005ae9c61a10abbfa6585c664 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+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
+
 2008-11-19  Jürg Billeter  <j@bitron.ch>
 
        * vala/valatypeofexpression.vala:
 
        Include C header files for types used in typeof expressions,
-       fixes bug 559454
+       fixes bug 559494
 
 2008-11-19  Jürg Billeter  <j@bitron.ch>
 

diff --git a/THANKS b/THANKS
index 810b92b5b338184be5c6597534147a2948098f7a..8ddab6c59f086c54200a61a229652a4fee0d2273 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -64,6 +64,7 @@ Roland Hostettler
 Ross Burton
 Sam Liddicott
 Samuel Cormier-Iijima
+Sebastian Dröge
 Stéphan Kochen
 Tai Chi Minh Ralph Eastwood
 Thijs Vermeir

diff --git a/vala/valacatchclause.vala b/vala/valacatchclause.vala
index cb6d2a6931c5e55344a88620b33003e30684f858..60fa176eb58fa0a7fb66809c51cb9b4870387daf 100644 (file)
--- a/vala/valacatchclause.vala
+++ b/vala/valacatchclause.vala
@@ -103,8 +103,6 @@ public class Vala.CatchClause : CodeNode {
                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 @@ public class Vala.CatchClause : CodeNode {
 
                error_type.check (analyzer);
 
+               analyzer.current_source_file.add_type_dependency (error_type, SourceFileDependencyType.SOURCE);
+
                body.check (analyzer);
 
                return !error;

diff --git a/vala/valaerrortype.vala b/vala/valaerrortype.vala
index 0e3ff6047103492a8db68500d49c7b5ca7deb775..8d19cb3c03468b199169eba84e23f8075eaed3ef 100644 (file)
--- a/vala/valaerrortype.vala
+++ b/vala/valaerrortype.vala
@@ -129,4 +129,11 @@ public class Vala.ErrorType : ReferenceType {
        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;
+       }
 }