vala r1853 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Fri Oct 17 13:35:56 2008
New Revision: 1853
URL: http://svn.gnome.org/viewvc/vala?rev=1853&view=rev

Log:
2008-10-17  JÃrg Billeter  <j bitron ch>

	* vala/valasymbolresolver.vala:

	Ignore non-type symbols when resolving types


Modified:
   trunk/ChangeLog
   trunk/vala/valasymbolresolver.vala

Modified: trunk/vala/valasymbolresolver.vala
==============================================================================
--- trunk/vala/valasymbolresolver.vala	(original)
+++ trunk/vala/valasymbolresolver.vala	Fri Oct 17 13:35:56 2008
@@ -200,6 +200,12 @@
 			Scope scope = current_scope;
 			while (sym == null && scope != null) {
 				sym = scope.lookup (unresolved_symbol.name);
+
+				// only look for types and type containers
+				if (!(sym is Namespace || sym is TypeSymbol || sym is TypeParameter)) {
+					sym = null;
+				}
+
 				scope = scope.parent_scope;
 			}
 			if (sym == null) {
@@ -209,6 +215,12 @@
 					}
 
 					var local_sym = ns.namespace_symbol.scope.lookup (unresolved_symbol.name);
+
+					// only look for types and type containers
+					if (!(local_sym is Namespace || local_sym is TypeSymbol || sym is TypeParameter)) {
+						local_sym = null;
+					}
+
 					if (local_sym != null) {
 						if (sym != null) {
 							unresolved_symbol.error = true;