Hi,
===================================================================
Estimated hours taken: 0.5
Fix a bug where the compiler failed to bootcheck in the hlc grades as
univ is no longer a builtin type.
runtime/mercury.c:
Remove all references to the univ type.
Index: runtime/mercury.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.c,v
retrieving revision 1.20
diff -u -r1.20 mercury.c
--- runtime/mercury.c 2001/01/10 10:57:24 1.20
+++ runtime/mercury.c 2001/01/11 17:00:22
@@ -82,7 +82,6 @@
mercury__builtin__do_unify__c_pointer_0_0,
mercury__builtin__do_unify__func_0_0,
mercury__builtin__do_unify__pred_0_0,
- mercury__std_util__do_unify__univ_0_0,
mercury__std_util__do_unify__type_desc_0_0;
static MR_UnifyFunc_1
@@ -102,7 +101,6 @@
mercury__builtin__do_compare__c_pointer_0_0,
mercury__builtin__do_compare__func_0_0,
mercury__builtin__do_compare__pred_0_0,
- mercury__std_util__do_compare__univ_0_0,
mercury__std_util__do_compare__type_desc_0_0;
static MR_CompareFunc_1
@@ -440,26 +438,6 @@
}
bool MR_CALL
-mercury__std_util____Unify____univ_0_0(MR_Univ x, MR_Univ y)
-{
- MR_TypeInfo typeinfo_x, typeinfo_y;
- MR_Word value_x, value_y;
- int comp;
-
- MR_unravel_univ(x, typeinfo_x, value_x);
- MR_unravel_univ(y, typeinfo_y, value_y);
-
- comp = MR_compare_type_info(typeinfo_x, typeinfo_y);
-
- if (comp != MR_COMPARE_EQUAL) {
- return FALSE;
- }
-
- return mercury__builtin__unify_2_p_0((MR_Mercury_Type_Info) typeinfo_x,
- (MR_Box) value_x, (MR_Box) value_y);
-}
-
-bool MR_CALL
mercury__std_util____Unify____type_desc_0_0(MR_Type_Desc x, MR_Type_Desc y)
{
int comp;
@@ -607,28 +585,6 @@
}
void MR_CALL
-mercury__std_util____Compare____univ_0_0(MR_Comparison_Result *result,
- MR_Univ x, MR_Univ y)
-{
- MR_TypeInfo typeinfo_x, typeinfo_y;
- MR_Word value_x, value_y;
- int comp;
-
- MR_unravel_univ(x, typeinfo_x, value_x);
- MR_unravel_univ(y, typeinfo_y, value_y);
-
- comp = MR_compare_type_info(typeinfo_x, typeinfo_y);
-
- if (comp != MR_COMPARE_EQUAL) {
- *result = comp;
- return;
- }
-
- mercury__builtin__compare_3_p_0((MR_Mercury_Type_Info) typeinfo_x,
- result, (MR_Box) value_x, (MR_Box) value_y);
-}
-
-void MR_CALL
mercury__std_util____Compare____type_desc_0_0(
MR_Comparison_Result *result, MR_Type_Desc x, MR_Type_Desc y)
{
@@ -749,13 +705,6 @@
}
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(
@@ -882,14 +831,6 @@
}
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__std_util__do_compare__type_desc_0_0(
MR_Comparison_Result *result, MR_Box x, MR_Box y)
{
@@ -1021,7 +962,6 @@
MR_init_entry(mercury__builtin____Unify____func_0_0);
MR_init_entry(mercury__builtin____Unify____pred_0_0);
MR_init_entry(mercury__array____Unify____array_1_0);
- MR_init_entry(mercury__std_util____Unify____univ_0_0);
MR_init_entry(mercury__std_util____Unify____type_desc_0_0);
MR_init_entry(mercury__private_builtin____Unify____type_ctor_info_1_0);
MR_init_entry(mercury__private_builtin____Unify____type_info_1_0);
@@ -1037,7 +977,6 @@
MR_init_entry(mercury__builtin____Compare____func_0_0);
MR_init_entry(mercury__builtin____Compare____pred_0_0);
MR_init_entry(mercury__array____Compare____array_1_0);
- MR_init_entry(mercury__std_util____Compare____univ_0_0);
MR_init_entry(mercury__std_util____Compare____type_desc_0_0);
MR_init_entry(mercury__private_builtin____Compare____type_ctor_info_1_0);
MR_init_entry(mercury__private_builtin____Compare____type_info_1_0);
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------