vala r833 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Jan 12 13:01:31 2008
New Revision: 833
URL: http://svn.gnome.org/viewvc/vala?rev=833&view=rev

Log:
2008-01-12  Juerg Billeter  <j bitron ch>

	* vala/valasemanticanalyzer.vala: restore current_return_type
	  after processing lambda expressions, fixes bug 501586


Modified:
   trunk/ChangeLog
   trunk/vala/valasemanticanalyzer.vala

Modified: trunk/vala/valasemanticanalyzer.vala
==============================================================================
--- trunk/vala/valasemanticanalyzer.vala	(original)
+++ trunk/vala/valasemanticanalyzer.vala	Sat Jan 12 13:01:31 2008
@@ -349,6 +349,8 @@
 			}
 		}
 
+		var old_symbol = current_symbol;
+		var old_return_type = current_return_type;
 		current_symbol = m;
 		current_return_type = m.return_type;
 
@@ -364,8 +366,8 @@
 
 		m.accept_children (this);
 
-		current_symbol = current_symbol.parent_symbol;
-		current_return_type = null;
+		current_symbol = old_symbol;
+		current_return_type = old_return_type;
 
 		if (current_symbol.parent_symbol is Method) {
 			/* lambda expressions produce nested methods */