[m-dev.] diff: fix bugs in type_info type_ctor_info

[Fergus Henderson]

Estimated hours taken: 0.5

library/std_util.m:
	Fix some bugs in the definition of the type_ctor_info for
	type_info/0 that Tyson recently added.  These bugs meant
	that it didn't compile in some grades.

	Also delete some long obsolete stuff inside `#ifdef COMPACT_ARGS'.

Workspace: /home/mercury0/fjh/mercury
Index: library/std_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/std_util.m,v
retrieving revision 1.172
diff -u -d -r1.172 std_util.m
--- std_util.m	1999/11/15 10:12:15	1.172
+++ std_util.m	1999/11/16 11:09:15
@@ -1058,12 +1058,16 @@
 	MR_TYPE_CTOR_FUNCTORS_SPECIAL
 };
 
-const struct MR_TypeCtorInfo_struct
+Declare_entry(mercury____Unify___std_util__type_info_0_0),
+Declare_entry(mercury____Index___std_util__type_info_0_0),
+Declare_entry(mercury____Compare___std_util__type_info_0_0),
+
+MR_STATIC_CODE_CONST struct MR_TypeCtorInfo_struct
 mercury_data_std_util__type_ctor_info_type_info_0 = {
 	(Integer) 0,
-	ENTRY(mercury____Unify___std_util__type_info_0_0),
-	ENTRY(mercury____Index___std_util__type_info_0_0),
-	ENTRY(mercury____Compare___std_util__type_info_0_0),
+	MR_MAYBE_STATIC_CODE(ENTRY(mercury____Unify___std_util__type_info_0_0)),
+	MR_MAYBE_STATIC_CODE(ENTRY(mercury____Index___std_util__type_info_0_0)),
+	MR_MAYBE_STATIC_CODE(ENTRY(mercury____Compare___std_util__type_info_0_0)),
 	(Integer) 15,
 	(Word *) &mercury_data_std_util__type_ctor_functors_type_info_0,
 	(Word *) &mercury_data_std_util__type_ctor_layout_type_info_0,
@@ -1071,17 +1075,6 @@
 	string_const(""type_info"", 9),
 	MR_RTTI_VERSION
 };
-
-#ifndef	COMPACT_ARGS
-
-Declare_label(mercury____Compare___std_util__univ_0_0_i1);
-
-MR_MAKE_PROC_LAYOUT(mercury____Compare___std_util__univ_0_0,
-	MR_DETISM_DET, 1, MR_LONG_LVAL_STACKVAR(1),
-	MR_PREDICATE, ""std_util"", ""compare_univ"", 3, 0);
-MR_MAKE_INTERNAL_LAYOUT(mercury____Compare___std_util__univ_0_0, 1);
-
-#endif
 
 Define_extern_entry(mercury____Unify___std_util__type_info_0_0);
 Define_extern_entry(mercury____Index___std_util__type_info_0_0);

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------