From: Jürg Billeter <j@bitron.ch>
Date: Thu, 18 Dec 2008 14:11:37 +0000 (+0000)
Subject: Support error propagation from base constructor, fixes bug 564984
X-Git-Tag: VALA_0_5_4~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=693a503a23e0458af017f27ffbedc1b1b5bc8e6f;p=thirdparty%2Fvala.git

Support error propagation from base constructor, fixes bug 564984

2008-12-18  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodemethodcallmodule.vala:

	Support error propagation from base constructor, fixes bug 564984

svn path=/trunk/; revision=2211
---

diff --git a/ChangeLog b/ChangeLog
index 68761408b..86600fa1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-18  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodemethodcallmodule.vala:
+
+	Support error propagation from base constructor, fixes bug 564984
+
 2008-12-18  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valaccodemethodmodule.vala:
diff --git a/gobject/valaccodemethodcallmodule.vala b/gobject/valaccodemethodcallmodule.vala
index 95b05ab40..2c56cd158 100644
--- a/gobject/valaccodemethodcallmodule.vala
+++ b/gobject/valaccodemethodcallmodule.vala
@@ -362,7 +362,9 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 			}
 		}
 
-		if (expr.tree_can_fail) {
+		if (m is CreationMethod && m.get_error_types ().size > 0) {
+			carg_map.set (get_param_pos (-1), new CCodeIdentifier ("error"));
+		} else if (expr.tree_can_fail) {
 			// method can fail
 			current_method_inner_error = true;
 			// add &inner_error before the ellipsis arguments