From: Jürg Billeter <j@bitron.ch>
Date: Sat, 8 Jan 2011 13:25:59 +0000 (+0100)
Subject: Fix formal_target_type in conditional expressions
X-Git-Tag: 0.10.3~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e953d12924ca68a162f213bec33ad40aa327c760;p=thirdparty%2Fvala.git

Fix formal_target_type in conditional expressions

Fixes bug 638902.
---

diff --git a/vala/valaconditionalexpression.vala b/vala/valaconditionalexpression.vala
index 6c7e8d66b..9a6f2c23c 100644
--- a/vala/valaconditionalexpression.vala
+++ b/vala/valaconditionalexpression.vala
@@ -1,6 +1,6 @@
 /* valaconditionalexpression.vala
  *
- * Copyright (C) 2006-2009  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -176,6 +176,7 @@ public class Vala.ConditionalExpression : Expression {
 		false_block.replace_statement (false_decl, false_stmt);
 
 		var ma = new MemberAccess.simple (local.name, source_reference);
+		ma.formal_target_type = formal_target_type;
 		ma.target_type = target_type;
 		ma.check (analyzer);