[Dotgnu-pnet-commits] CVS: pnet/csdoc doc_valil.c,1.10,1.11

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/csdoc
In directory subversions:/tmp/cvs-serv23932/csdoc

Modified Files:
        doc_valil.c 
Log Message:


Handle long-form nested type names better.


Index: doc_valil.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csdoc/doc_valil.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** doc_valil.c 21 Nov 2002 01:23:57 -0000      1.10
--- doc_valil.c 3 Sep 2003 06:57:11 -0000       1.11
***************
*** 88,92 ****
--- 88,94 ----
        const char *name = ILClass_Name(classInfo);
        const char *namespace = ILClass_Namespace(classInfo);
+       char *parentName;
        char *fullName;
+       ILClass *parent;
        if(namespace)
        {
***************
*** 101,104 ****
--- 103,119 ----
                strcat(fullName, name);
        }
+       else if((parent = ILClass_NestedParent(classInfo)) != 0)
+       {
+               parentName = GetFullClassName(parent);
+               fullName = (char *)ILMalloc(strlen(parentName) + strlen(name) + 
2);
+               if(!fullName)
+               {
+                       ILDocOutOfMemory(0);
+               }
+               strcpy(fullName, parentName);
+               strcat(fullName, ".");
+               strcat(fullName, name);
+               ILFree(parentName);
+       }
        else
        {
***************
*** 176,181 ****
        char *name;
        ILClass *classInfo;
-       const char *className;
-       const char *classNamespace;
        const char *suffix;
        char buffer[128];
--- 191,194 ----
***************
*** 214,234 ****
        {
                classInfo = ILType_ToClass(type);
!               className = ILClass_Name(classInfo);
!               classNamespace = ILClass_Namespace(classInfo);
!               if(!classNamespace || shortForm)
                {
!                       name = ILDupString(className);
                }
                else
                {
!                       name = (char *)ILMalloc(strlen(className) +
!                                                                       
strlen(classNamespace) + 2);
!                       if(!name)
!                       {
!                               ILDocOutOfMemory(0);
!                       }
!                       strcpy(name, classNamespace);
!                       strcat(name, ".");
!                       strcat(name, className);
                }
        }
--- 227,237 ----
        {
                classInfo = ILType_ToClass(type);
!               if(shortForm)
                {
!                       name = ILDupString(ILClass_Name(classInfo));
                }
                else
                {
!                       name = GetFullClassName(classInfo);
                }
        }