[m-rev.] diff: fix demangling for type class instances

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

util/mdemangle.c:
	Fix demangling for type class instances.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: util/mdemangle.c
===================================================================
RCS file: /home/mercury1/repository/mercury/util/mdemangle.c,v
retrieving revision 1.49
diff -u -d -r1.49 mdemangle.c
--- util/mdemangle.c	10 Mar 2004 06:37:10 -0000	1.49
+++ util/mdemangle.c	6 Apr 2004 03:37:51 -0000
@@ -689,6 +689,11 @@
 	if (strip_prefix(&start, mercury_data)) {
 		/* LLDS */
 		high_level = MR_FALSE;
+		if (strip_prefix(&start, base_typeclass_info)) {
+			goto typeclass_info;
+		}
+		/* also try the old format,
+		   in case we're demangling old files */
 		if (strip_prefix(&start, underscores_base_typeclass_info)) {
 			goto typeclass_info;
 		}

-- 
Fergus Henderson                    |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------