From: Jürg Billeter <j@bitron.ch>
Date: Tue, 30 Dec 2008 18:41:34 +0000 (+0000)
Subject: Support instance access in lambda expressions in property accessors
X-Git-Tag: VALA_0_5_4~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5215d0e8b7747fe8399ff5ccde616b8787e53dde;p=thirdparty%2Fvala.git

Support instance access in lambda expressions in property accessors

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

	* vala/valalambdaexpression.vala:

	Support instance access in lambda expressions in property accessors

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

diff --git a/ChangeLog b/ChangeLog
index ad14c3bcc..05fc8bd69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-30  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valalambdaexpression.vala:
+
+	Support instance access in lambda expressions in property accessors
+
 2008-12-26  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valaccodebasemodule.vala:
diff --git a/vala/valalambdaexpression.vala b/vala/valalambdaexpression.vala
index 52415a915..f13e9588e 100644
--- a/vala/valalambdaexpression.vala
+++ b/vala/valalambdaexpression.vala
@@ -133,17 +133,9 @@ public class Vala.LambdaExpression : Expression {
 			return false;
 		}
 
-		bool in_instance_method = false;
-		var current_method = analyzer.find_current_method ();
-		if (current_method != null) {
-			in_instance_method = (current_method.binding == MemberBinding.INSTANCE);
-		} else {
-			in_instance_method = analyzer.is_in_constructor ();
-		}
-
 		var cb = (Delegate) ((DelegateType) target_type).delegate_symbol;
 		method = new Method (get_lambda_name (analyzer), cb.return_type);
-		if (!cb.has_target || !in_instance_method) {
+		if (!cb.has_target || !analyzer.is_in_instance_method ()) {
 			method.binding = MemberBinding.STATIC;
 		}
 		method.owner = analyzer.current_symbol.scope;