Only quote typedef's.

svn path=/trunk/mono/; revision=37624

diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index 22c7e6638ca0ce611e07418ae866bb68041a13dc..a9c87120b5644c43b2a70144ddc3a749b82e6bcd 100644 (file)
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -7,7 +7,7 @@
 
 2004-12-11  Martin Baulig  <martin@ximian.com>
 
-       * get.c (get_token): Escape typedefs and typerefs.
+       * get.c (get_token): Escape typedefs.
 
 2004-12-11  Martin Baulig  <martin@ximian.com>
 
@@ -27,7 +27,7 @@
 
 2004-12-10  Martin Baulig  <martin@ximian.com>
 
-       * get.c (init_key_table): Added `type'.
+       * get.c (init_key_table): Added `type' and `strict'.
        (get_generic_param): Also escape the type parameter names.
        Correctly handle multiple constraints.
 

diff --git a/mono/dis/get.c b/mono/dis/get.c
index 5afefa9a34d01961328ec3188c59ebf1d14f65a2..5308618495addc6023882873b0312c2a4a84fbdd 100644 (file)
--- a/mono/dis/get.c
+++ b/mono/dis/get.c
@@ -1848,10 +1848,7 @@ get_token (MonoImage *m, guint32 token, MonoGenericContext *context)
                g_free (temp);
                return result;
        case MONO_TOKEN_TYPE_REF:
-               temp = get_typeref (m, idx);
-               result = get_escaped_name (temp);
-               g_free (temp);
-               return result;
+               return get_typeref (m, idx);
        case MONO_TOKEN_TYPE_SPEC:
                return get_typespec (m, idx, TRUE, context);
        case MONO_TOKEN_MEMBER_REF: {
@@ -2467,6 +2464,7 @@ init_key_table (void)
        g_hash_table_insert (key_table, (char *) "stored_object", GINT_TO_POINTER (TRUE));
        g_hash_table_insert (key_table, (char *) "streamed_object", GINT_TO_POINTER (TRUE));
        g_hash_table_insert (key_table, (char *) "stream", GINT_TO_POINTER (TRUE));
+       g_hash_table_insert (key_table, (char *) "strict", GINT_TO_POINTER (TRUE));
        g_hash_table_insert (key_table, (char *) "string", GINT_TO_POINTER (TRUE));
        g_hash_table_insert (key_table, (char *) "struct", GINT_TO_POINTER (TRUE));
        g_hash_table_insert (key_table, (char *) "synchronized", GINT_TO_POINTER (TRUE));