Author: ankit
Date: 2006-01-19 08:21:49 -0500 (Thu, 19 Jan 2006)
New Revision: 55780
Modified:
branches/mono-1-1-13/mono/mono/dis/ChangeLog
branches/mono-1-1-13/mono/mono/dis/main.c
Log:
Backport r55715, r55772
2006-01-19 Ankit Jain <[EMAIL PROTECTED]>
* main.c (dis_type): Dump custom attributes for a type before doing the
same
for its type parameters.
2006-01-18 Ankit Jain <[EMAIL PROTECTED]>
* main.c (typedef_flags): Change 'special-name' to 'specialname'.
Modified: branches/mono-1-1-13/mono/mono/dis/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/dis/ChangeLog 2006-01-19 13:20:16 UTC
(rev 55779)
+++ branches/mono-1-1-13/mono/mono/dis/ChangeLog 2006-01-19 13:21:49 UTC
(rev 55780)
@@ -1,3 +1,12 @@
+2006-01-19 Ankit Jain <[EMAIL PROTECTED]>
+
+ * main.c (dis_type): Dump custom attributes for a type before doing the
same
+ for its type parameters.
+
+2006-01-18 Ankit Jain <[EMAIL PROTECTED]>
+
+ * main.c (typedef_flags): Change 'special-name' to 'specialname'.
+
2006-01-17 Ankit Jain <[EMAIL PROTECTED]>
* get.c (get_method_override): Use '.override method' syntax if the
class or
Modified: branches/mono-1-1-13/mono/mono/dis/main.c
===================================================================
--- branches/mono-1-1-13/mono/mono/dis/main.c 2006-01-19 13:20:16 UTC (rev
55779)
+++ branches/mono-1-1-13/mono/mono/dis/main.c 2006-01-19 13:21:49 UTC (rev
55780)
@@ -387,7 +387,7 @@
if (flags & TYPE_ATTRIBUTE_SEALED)
strcat (buffer, "sealed ");
if (flags & TYPE_ATTRIBUTE_SPECIAL_NAME)
- strcat (buffer, "special-name ");
+ strcat (buffer, "specialname ");
if (flags & TYPE_ATTRIBUTE_IMPORT)
strcat (buffer, "import ");
if (flags & TYPE_ATTRIBUTE_SERIALIZABLE)
@@ -1208,8 +1208,8 @@
dis_interfaces (m, n + 1, (MonoGenericContext *) container);
fprintf (output, " {\n");
if (!forward) {
+ dump_cattrs (m, MONO_TOKEN_TYPE_DEF | (n + 1), " ");
dump_cattrs_for_type_params (m, MONO_TOKEN_TYPE_DEF | (n + 1),
" ");
- dump_cattrs (m, MONO_TOKEN_TYPE_DEF | (n + 1), " ");
dump_declarative_security (m, OBJECT_TYPE_TYPEDEF, (n + 1), "
");
if (mono_metadata_packing_from_typedef (m, n + 1,
&packing_size, &class_size)) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches