Author: lluis
Date: 2007-08-14 11:29:47 -0400 (Tue, 14 Aug 2007)
New Revision: 84085

Modified:
   trunk/monodevelop/Extras/CSharpBinding/ChangeLog
   trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
Log:
* Parser/Resolver.cs: Properly resolve inner class names. Fixes part of
  #82414.

Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-08-14 15:26:49 UTC 
(rev 84084)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-08-14 15:29:47 UTC 
(rev 84085)
@@ -1,5 +1,10 @@
 2007-08-14  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * Parser/Resolver.cs: Properly resolve inner class names. Fixes part of
+         #82414.
+
+2007-08-14  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * Parser/Resolver.cs: When resolving a var name, parameters have 
priority
          over fields.
 

Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs   2007-08-14 
15:26:49 UTC (rev 84084)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs   2007-08-14 
15:29:47 UTC (rev 84085)
@@ -938,6 +938,17 @@
                                        i++;
                                }
                                while (i < namespaces.Length);
+                       
+                               // It may be an inner class
+                               
+                               IClass parentc = callingClass;
+                               do {
+                                       c = parserContext.GetClass 
(parentc.FullyQualifiedName + "." + name, genericArguments);
+                                       if (c != null && (c.IsPublic || 
c.IsProtected || c.IsInternal))
+                                               return c;
+                                       parentc = BaseClass (parentc);
+                               }
+                               while (parentc != null);
                        }
                        
                        // Now try to find the class using the included 
namespaces

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to