[Dotgnu-pnet-commits] CVS: pnet/dumpasm dump_type.c,1.11,1.12

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/dumpasm
In directory subversions:/tmp/cvs-serv27796/dumpasm

Modified Files:
        dump_type.c 
Log Message:


Fix the quoting of '&' characters in csdoc output, and other places where
types may be dumped in XML form.


Index: dump_type.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/dumpasm/dump_type.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** dump_type.c 19 Feb 2003 02:42:43 -0000      1.11
--- dump_type.c 28 Jul 2003 07:34:54 -0000      1.12
***************
*** 165,169 ****
                        {
                                ILDumpType(stream, image, ILType_Ref(type), 
flags);
!                               fputs(" &", stream);
                        }
                        break;
--- 165,176 ----
                        {
                                ILDumpType(stream, image, ILType_Ref(type), 
flags);
!                               if((flags & IL_DUMP_XML_QUOTING) != 0)
!                               {
!                                       fputs(" &", stream);
!                               }
!                               else
!                               {
!                                       fputs(" &", stream);
!                               }
                        }
                        break;
***************
*** 394,398 ****
                        {
                                fputs(" marshal(", stream);
!                               ILDumpNativeType(stream, type, typeLen);
                                putc(')', stream);
                        }
--- 401,405 ----
                        {
                                fputs(" marshal(", stream);
!                               ILDumpNativeType(stream, type, typeLen, flags);
                                putc(')', stream);
                        }
***************
*** 647,651 ****
   * Dump a variant type.
   */
! static void DumpVariantType(FILE *stream, ILUInt32 type)
  {
        switch(type & IL_META_VARIANTTYPE_BASE_TYPE_MASK)
--- 654,658 ----
   * Dump a variant type.
   */
! static void DumpVariantType(FILE *stream, ILUInt32 type, int flags)
  {
        switch(type & IL_META_VARIANTTYPE_BASE_TYPE_MASK)
***************
*** 913,917 ****
        if((type & IL_META_VARIANTTYPE_BYREF) != 0)
        {
!               fputs(" &", stream);
        }
  }
--- 920,931 ----
        if((type & IL_META_VARIANTTYPE_BYREF) != 0)
        {
!               if((flags & IL_DUMP_XML_QUOTING) != 0)
!               {
!                       fputs(" &", stream);
!               }
!               else
!               {
!                       fputs(" &", stream);
!               }
        }
  }
***************
*** 920,924 ****
   * Inner version of "ILDumpNativeType".
   */
! static void DumpNativeType(FILE *stream, ILMetaDataRead *reader)
  {
        unsigned long value;
--- 934,938 ----
   * Inner version of "ILDumpNativeType".
   */
! static void DumpNativeType(FILE *stream, ILMetaDataRead *reader, int flags)
  {
        unsigned long value;
***************
*** 1024,1028 ****
                case IL_META_NATIVETYPE_PTR:
                {
!                       DumpNativeType(stream, reader);
                        fputs(" *", stream);
                }
--- 1038,1042 ----
                case IL_META_NATIVETYPE_PTR:
                {
!                       DumpNativeType(stream, reader, flags);
                        fputs(" *", stream);
                }
***************
*** 1107,1111 ****
                        fputs("safearray ", stream);
                        value = ILMetaUncompressData(reader);
!                       DumpVariantType(stream, (ILUInt32)value);
                }
                break;
--- 1121,1125 ----
                        fputs("safearray ", stream);
                        value = ILMetaUncompressData(reader);
!                       DumpVariantType(stream, (ILUInt32)value, flags);
                }
                break;
***************
*** 1124,1128 ****
                        {
                                fputs("fixed array ", stream);
!                               DumpNativeType(stream, reader);
                                fprintf(stream, "[%lu]", value);
                        }
--- 1138,1142 ----
                        {
                                fputs("fixed array ", stream);
!                               DumpNativeType(stream, reader, flags);
                                fprintf(stream, "[%lu]", value);
                        }
***************
*** 1202,1206 ****
                case IL_META_NATIVETYPE_ARRAY:
                {
!                       DumpNativeType(stream, reader);
                        putc('[', stream);
                        value = ILMetaUncompressData(reader);
--- 1216,1220 ----
                case IL_META_NATIVETYPE_ARRAY:
                {
!                       DumpNativeType(stream, reader, flags);
                        putc('[', stream);
                        value = ILMetaUncompressData(reader);
***************
*** 1323,1327 ****
  }
  
! void ILDumpNativeType(FILE *stream, const void *type, unsigned long len)
  {
        ILMetaDataRead reader;
--- 1337,1342 ----
  }
  
! void ILDumpNativeType(FILE *stream, const void *type,
!                                         unsigned long len, int flags)
  {
        ILMetaDataRead reader;
***************
*** 1329,1333 ****
        reader.len = len;
        reader.error = 0;
!       DumpNativeType(stream, &reader);
  }
  
--- 1344,1348 ----
        reader.len = len;
        reader.error = 0;
!       DumpNativeType(stream, &reader, flags);
  }