[m-dev.] diff: array runtime and library dependency problem

[Peter Ross]

On Tue, Feb 06, 2001 at 12:33:25PM +0100, Peter Ross wrote:
> Hi,
> 
> I forgot to check this diff onto the version_0_10_x branch, and I had to
> resolve some conflicts when porting across from the main branch.  So I
> thought I better post it again.
> 
> This is currently bootchecking, and if it passes I will check it in.
> 
It didn't pass bootcheck because I didn't do the merge properly.

Here is the relative diff

diff -u runtime/mercury.c runtime/mercury.c
--- runtime/mercury.c
+++ runtime/mercury.c
@@ -129,6 +129,7 @@
 MR_define_type_ctor_info(builtin, pred, 0, MR_TYPECTOR_REP_PRED);
 MR_define_type_ctor_info(builtin, func, 0, MR_TYPECTOR_REP_PRED);
 MR_define_type_ctor_info(builtin, tuple, 0, MR_TYPECTOR_REP_TUPLE);
+MR_define_type_ctor_info(std_util, univ, 0, MR_TYPECTOR_REP_UNIV);
 MR_define_type_ctor_info(std_util, type_desc, 0, MR_TYPECTOR_REP_TYPEINFO);
 MR_define_type_ctor_info(private_builtin, type_ctor_info, 1,
 	MR_TYPECTOR_REP_TYPEINFO);
@@ -691,6 +692,13 @@
 }
 
 static bool MR_CALL
+mercury__std_util__do_unify__univ_0_0(MR_Box x, MR_Box y)
+{
+	return mercury__std_util____Unify____univ_0_0(
+		(MR_Univ) x, (MR_Univ) y);
+}
+
+static bool MR_CALL
 mercury__std_util__do_unify__type_desc_0_0(MR_Box x, MR_Box y)
 {
 	return mercury__std_util____Unify____type_desc_0_0(
@@ -805,6 +813,14 @@
 {
 	mercury__builtin____Compare____tuple_0_0(
 		type_info, result, (MR_Tuple) x, (MR_Tuple) y);
+}
+
+static void MR_CALL
+mercury__std_util__do_compare__univ_0_0(
+	MR_Comparison_Result *result, MR_Box x, MR_Box y)
+{
+	mercury__std_util____Compare____univ_0_0(
+		result, (MR_Univ) x, (MR_Univ) y);
 }
 
 static void MR_CALL
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------