Author: lluis
Date: 2006-07-05 05:50:28 -0400 (Wed, 05 Jul 2006)
New Revision: 62258

Modified:
   trunk/monodevelop/Extras/CSharpBinding/CSharpAmbience.cs
   trunk/monodevelop/Extras/CSharpBinding/ChangeLog
   trunk/monodevelop/Extras/CSharpBinding/Parser/CSharpVisitor.cs
   trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs
   trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
Log:
2006-07-05 Matej Urbas <[EMAIL PROTECTED]>
 
        * CSharpAmbience.cs: Fixed a regression that displayed all base types 
of a
          class to be of PersistentReturnType type.
        * Parser/CodeGenerator.cs:
        * Parser/CSharpVisitor.cs:
        * Parser/Resolver.cs: Updated to use ReturnType as BaseTypes in IClass
          instances.
 


Modified: trunk/monodevelop/Extras/CSharpBinding/CSharpAmbience.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/CSharpAmbience.cs    2006-07-05 
09:50:01 UTC (rev 62257)
+++ trunk/monodevelop/Extras/CSharpBinding/CSharpAmbience.cs    2006-07-05 
09:50:28 UTC (rev 62258)
@@ -178,7 +178,7 @@
                                if (c.BaseTypes.Count > 0) {
                                        builder.Append(" : ");
                                        for (int i = 0; i < c.BaseTypes.Count; 
++i) {
-                                               builder.Append(c.BaseTypes[i]);
+                                               
builder.Append(c.BaseTypes[i].FullyQualifiedName);
                                                if (i + 1 < c.BaseTypes.Count) {
                                                        builder.Append(", ");
                                                }

Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2006-07-05 09:50:01 UTC 
(rev 62257)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2006-07-05 09:50:28 UTC 
(rev 62258)
@@ -1,3 +1,12 @@
+2006-07-05 Matej Urbas <[EMAIL PROTECTED]>
+ 
+       * CSharpAmbience.cs: Fixed a regression that displayed all base types 
of a
+         class to be of PersistentReturnType type.
+       * Parser/CodeGenerator.cs:
+       * Parser/CSharpVisitor.cs:
+       * Parser/Resolver.cs: Updated to use ReturnType as BaseTypes in IClass
+         instances.
+ 
 2006-07-04  Michael Hutchinson <[EMAIL PROTECTED]>
 
        * CSharpEnhancedCodeProvider.cs: Fix parsing of imports

Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/CSharpVisitor.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/CSharpVisitor.cs      
2006-07-05 09:50:01 UTC (rev 62257)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/CSharpVisitor.cs      
2006-07-05 09:50:28 UTC (rev 62258)
@@ -165,7 +165,7 @@
                        }
                        if (typeDeclaration.BaseTypes != null) {
                                foreach 
(ICSharpCode.NRefactory.Parser.AST.TypeReference type in 
typeDeclaration.BaseTypes) {
-                                       c.BaseTypes.Add(type.Type);
+                                       c.BaseTypes.Add(new 
ReturnType(type.Type));
                                }
                        }
                        currentClass.Push(c);

Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs      
2006-07-05 09:50:01 UTC (rev 62257)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs      
2006-07-05 09:50:28 UTC (rev 62258)
@@ -177,8 +177,8 @@
                                return true;
                                
                        if (type.BaseTypes != null) {
-                               foreach (string bc in type.BaseTypes) {
-                                       IClass bcls = 
ctx.ParserContext.GetClass (bc, true, true);
+                               foreach (IReturnType bc in type.BaseTypes) {
+                                       IClass bcls = 
ctx.ParserContext.GetClass (bc.FullyQualifiedName, true, true);
                                        if (bcls != null && IsExpectedClass 
(bcls))
                                                return true;
                                }

Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs   2006-07-05 
09:50:01 UTC (rev 62257)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs   2006-07-05 
09:50:28 UTC (rev 62258)
@@ -333,8 +333,8 @@
                        }
 //                     Console.WriteLine("ClassType = " + curType.ClassType);
                        if (curType.ClassType == ClassType.Interface && 
!showStatic) {
-                               foreach (string s in curType.BaseTypes) {
-                                       IClass baseClass = 
parserContext.GetClass (s, true, true);
+                               foreach (IReturnType s in curType.BaseTypes) {
+                                       IClass baseClass = 
parserContext.GetClass (s.FullyQualifiedName, true, true);
                                        if (baseClass != null && 
baseClass.ClassType == ClassType.Interface) {
                                                ListMembers(members, baseClass);
                                        }
@@ -352,8 +352,8 @@
                
                public IClass BaseClass(IClass curClass)
                {
-                       foreach (string s in curClass.BaseTypes) {
-                               IClass baseClass = parserContext.GetClass (s, 
true, true);
+                       foreach (IReturnType s in curClass.BaseTypes) {
+                               IClass baseClass = parserContext.GetClass 
(s.FullyQualifiedName, true, true);
                                if (baseClass != null && baseClass.ClassType != 
ClassType.Interface) {
                                        return baseClass;
                                }
@@ -567,8 +567,8 @@
                                        }
                                }
                        }
-                       foreach (string baseType in curType.BaseTypes) {
-                               IClass c = parserContext.GetClass (baseType, 
true, true);
+                       foreach (IReturnType baseType in curType.BaseTypes) {
+                               IClass c = parserContext.GetClass 
(baseType.FullyQualifiedName, true, true);
                                if (c != null)
                                        return SearchClassMember (new 
ReturnType(c.FullyQualifiedName), memberName, includeMethods, out curType, out 
member);
                        }
@@ -900,8 +900,8 @@
                        if (possibleBaseClass.FullyQualifiedName == 
c.FullyQualifiedName) {
                                return true;
                        }
-                       foreach (string baseClass in c.BaseTypes) {
-                               IClass bc = parserContext.GetClass (baseClass, 
true, true);
+                       foreach (IReturnType baseClass in c.BaseTypes) {
+                               IClass bc = parserContext.GetClass 
(baseClass.FullyQualifiedName, true, true);
                                if (IsClassInInheritanceTree(possibleBaseClass, 
bc)) {
                                        return true;
                                }

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

Reply via email to