[m-dev.] diff: rename MR_Type_Info
Fergus Henderson
fjh at cs.mu.OZ.AU
Tue Oct 24 02:02:37 AEDT 2000
Estimated hours taken: 1
runtime/mercury.h:
Rename MR_Type_Info as MR_Mercury_Type_Info,
to avoid confusing it with MR_TypeInfo.
Likewise for MR_Type_Ctor_Info, etc.
Add some comments explaining this.
runtime/mercury.c:
library/builtin.m:
library/exception.m:
Trivial modifications to reflect the above renaming.
Workspace: /home/pgrad/fjh/ws/hg
Index: runtime/mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.21
diff -u -d -r1.21 mercury.h
--- runtime/mercury.h 2000/09/29 10:58:14 1.21
+++ runtime/mercury.h 2000/10/23 14:53:56
@@ -83,6 +83,13 @@
/*
** Define some names for types that differ depending
** on whether --high-level-data is enabled.
+** These types all correspond to Mercury data types.
+** Some of the have `Mercury_' in their name, to distinguish
+** them from the corresponding C data type.
+** E.g. `MR_Mercury_Type_Info' (below) is the abstract type that the
+** Mercury compiler generates for a type_info argument, whereas
+** `MR_TypeInfo' (defined in runtime/mercury_type_info.h) is the
+** concrete C type that is used by the C code in the runtime.
*/
#ifdef MR_HIGHLEVEL_DATA
typedef MR_Integer /* really `enum mercury__builtin__comparison_result_0' */
@@ -94,9 +101,12 @@
typedef struct mercury__array__array_1_s * MR_Array;
typedef struct mercury__std_util__univ_0_s * MR_Univ;
typedef struct mercury__std_util__type_desc_0_s * MR_Type_Desc;
- typedef struct mercury__private_builtin__type_info_1_s * MR_Type_Info;
- typedef struct mercury__private_builtin__type_ctor_info_1_s * MR_Type_Ctor_Info;
- typedef struct mercury__private_builtin__typeclass_info_1_s * MR_TypeClass_Info;
+ typedef struct mercury__private_builtin__type_info_1_s *
+ MR_Mercury_Type_Info;
+ typedef struct mercury__private_builtin__type_ctor_info_1_s *
+ MR_Mercury_Type_Ctor_Info;
+ typedef struct mercury__private_builtin__typeclass_info_1_s *
+ MR_Mercury_TypeClass_Info;
typedef struct mercury__private_builtin__base_typeclass_info_1_s *
MR_Base_TypeClass_Info;
#else
@@ -109,10 +119,10 @@
typedef MR_Word MR_Array;
typedef MR_Word MR_Univ;
typedef MR_Word MR_Type_Desc;
- typedef MR_Word MR_Type_Info;
- typedef MR_Word MR_Type_Ctor_Info;
- typedef MR_Word MR_TypeClass_Info;
- typedef MR_Word MR_Base_TypeClass_Info;
+ typedef MR_Word MR_Mercury_Type_Info;
+ typedef MR_Word MR_Mercury_Type_Ctor_Info;
+ typedef MR_Word MR_Mercury_TypeClass_Info;
+ typedef MR_Word MR_Mercury_Base_TypeClass_Info;
#endif
/*
@@ -352,14 +362,14 @@
** Function declarations
*/
-bool mercury__builtin__unify_2_p_0(MR_Type_Info, MR_Box, MR_Box);
-void mercury__builtin__compare_3_p_0(MR_Type_Info,
+bool mercury__builtin__unify_2_p_0(MR_Mercury_Type_Info, MR_Box, MR_Box);
+void mercury__builtin__compare_3_p_0(MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-void mercury__builtin__compare_3_p_1(MR_Type_Info,
+void mercury__builtin__compare_3_p_1(MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-void mercury__builtin__compare_3_p_2(MR_Type_Info,
+void mercury__builtin__compare_3_p_2(MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-void mercury__builtin__compare_3_p_3(MR_Type_Info,
+void mercury__builtin__compare_3_p_3(MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
bool mercury__builtin____Unify____int_0_0(MR_Integer x, MR_Integer y);
@@ -371,22 +381,25 @@
MR_C_Pointer x, MR_C_Pointer y);
bool mercury__builtin____Unify____func_0_0(MR_Func x, MR_Func y);
bool mercury__builtin____Unify____pred_0_0(MR_Pred x, MR_Pred y);
-bool mercury__builtin____Unify____tuple_0_0(MR_Type_Info type_info,
+bool mercury__builtin____Unify____tuple_0_0(MR_Mercury_Type_Info type_info,
MR_Tuple x, MR_Tuple y);
-bool mercury__array____Unify____array_1_0(MR_Type_Info type_info,
+bool mercury__array____Unify____array_1_0(MR_Mercury_Type_Info type_info,
MR_Array x, MR_Array y);
bool mercury__std_util____Unify____univ_0_0(MR_Univ x, MR_Univ y);
bool mercury__std_util____Unify____type_desc_0_0(
MR_Type_Desc x, MR_Type_Desc y);
bool mercury__private_builtin____Unify____type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Type_Ctor_Info x, MR_Type_Ctor_Info y);
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_Type_Ctor_Info x, MR_Mercury_Type_Ctor_Info y);
bool mercury__private_builtin____Unify____type_info_1_0(
- MR_Type_Info type_info, MR_Type_Info x, MR_Type_Info y);
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_Type_Info x, MR_Mercury_Type_Info y);
bool mercury__private_builtin____Unify____typeclass_info_1_0(
- MR_Type_Info type_info, MR_TypeClass_Info x, MR_TypeClass_Info y);
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_TypeClass_Info x, MR_Mercury_TypeClass_Info y);
bool mercury__private_builtin____Unify____base_typeclass_info_1_0(
- MR_Type_Info type_info, MR_Base_TypeClass_Info x,
- MR_Base_TypeClass_Info y);
+ MR_Mercury_Type_Info type_info, MR_Mercury_Base_TypeClass_Info x,
+ MR_Mercury_Base_TypeClass_Info y);
void mercury__builtin____Compare____int_0_0(
MR_Comparison_Result *result, MR_Integer x, MR_Integer y);
@@ -404,26 +417,26 @@
MR_Comparison_Result *result, MR_Func x, MR_Func y);
void mercury__builtin____Compare____pred_0_0(
MR_Comparison_Result *result, MR_Pred x, MR_Pred y);
-void mercury__builtin____Compare____tuple_0_0(MR_Type_Info type_info,
+void mercury__builtin____Compare____tuple_0_0(MR_Mercury_Type_Info type_info,
MR_Comparison_Result *result, MR_Tuple x, MR_Tuple y);
-void mercury__array____Compare____array_1_0(MR_Type_Info type_info,
+void mercury__array____Compare____array_1_0(MR_Mercury_Type_Info type_info,
MR_Comparison_Result *result, MR_Array x, MR_Array y);
void mercury__std_util____Compare____univ_0_0(
MR_Comparison_Result *result, MR_Univ x, MR_Univ y);
void mercury__std_util____Compare____type_desc_0_0(
MR_Comparison_Result *result, MR_Type_Desc x, MR_Type_Desc y);
void mercury__private_builtin____Compare____type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_Type_Ctor_Info x, MR_Type_Ctor_Info y);
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Ctor_Info x, MR_Mercury_Type_Ctor_Info y);
void mercury__private_builtin____Compare____type_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_Type_Info x, MR_Type_Info y);
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info x, MR_Mercury_Type_Info y);
void mercury__private_builtin____Compare____typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_TypeClass_Info x, MR_TypeClass_Info y);
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_TypeClass_Info x, MR_Mercury_TypeClass_Info y);
void mercury__private_builtin____Compare____base_typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_Base_TypeClass_Info x, MR_Base_TypeClass_Info y);
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Base_TypeClass_Info x, MR_Mercury_Base_TypeClass_Info y);
/*---------------------------------------------------------------------------*/
Index: library/builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/builtin.m,v
retrieving revision 1.40
diff -u -d -r1.40 builtin.m
--- library/builtin.m 2000/10/16 01:33:42 1.40
+++ library/builtin.m 2000/10/23 14:29:45
@@ -379,8 +379,8 @@
:- pragma c_header_code("
#ifdef MR_HIGHLEVEL_CODE
- void mercury__builtin__copy_2_p_0(MR_Type_Info, MR_Box, MR_Box *);
- void mercury__builtin__copy_2_p_1(MR_Type_Info, MR_Box, MR_Box *);
+ void mercury__builtin__copy_2_p_0(MR_Mercury_Type_Info, MR_Box, MR_Box *);
+ void mercury__builtin__copy_2_p_1(MR_Mercury_Type_Info, MR_Box, MR_Box *);
#endif
").
@@ -389,7 +389,7 @@
#ifdef MR_HIGHLEVEL_CODE
void
-mercury__builtin__copy_2_p_0(MR_Type_Info type_info,
+mercury__builtin__copy_2_p_0(MR_Mercury_Type_Info type_info,
MR_Box value, MR_Box * copy)
{
MR_Word val = (MR_Word) value;
@@ -397,7 +397,7 @@
}
void
-mercury__builtin__copy_2_p_1(MR_Type_Info type_info, MR_Box x, MR_Box * y)
+mercury__builtin__copy_2_p_1(MR_Mercury_Type_Info type_info, MR_Box x, MR_Box * y)
{
mercury__builtin__copy_2_p_0(type_info, x, y);
}
Index: library/exception.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/exception.m,v
retrieving revision 1.30
diff -u -d -r1.30 exception.m
--- library/exception.m 2000/10/16 01:33:43 1.30
+++ library/exception.m 2000/10/23 14:40:56
@@ -507,13 +507,13 @@
void mercury__exception__builtin_throw_1_p_0(MR_Univ exception);
void mercury__exception__builtin_catch_model_det(
- MR_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
+ MR_Mercury_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
MR_Box *output);
bool mercury__exception__builtin_catch_model_semi(
- MR_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
+ MR_Mercury_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
MR_Box *output);
void mercury__exception__builtin_catch_model_non(
- MR_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
+ MR_Mercury_Type_Info type_info, MR_Pred pred, MR_Pred handler_pred,
MR_Box *output,
#ifdef MR_USE_GCC_NESTED_FUNCTIONS
MR_NestedCont cont
@@ -530,7 +530,8 @@
/*---------------------------------------------------------------------------*/
static void
-ML_call_goal_det(MR_Type_Info type_info, MR_Pred closure, MR_Box *result)
+ML_call_goal_det(MR_Mercury_Type_Info type_info,
+ MR_Pred closure, MR_Box *result)
{
typedef void FuncType(void *, MR_Box *);
FuncType *code = (FuncType *)
@@ -539,7 +540,8 @@
}
static bool
-ML_call_goal_semi(MR_Type_Info type_info, MR_Pred closure, MR_Box *result)
+ML_call_goal_semi(MR_Mercury_Type_Info type_info,
+ MR_Pred closure, MR_Box *result)
{
typedef bool FuncType(void *, MR_Box *);
FuncType *code = (FuncType *)
@@ -550,8 +552,8 @@
#ifdef MR_USE_GCC_NESTED_FUNCTIONS
static void
-ML_call_goal_non(MR_Type_Info type_info, MR_Pred closure, MR_Box *result,
- MR_NestedCont cont)
+ML_call_goal_non(MR_Mercury_Type_Info type_info,
+ MR_Pred closure, MR_Box *result, MR_NestedCont cont)
{
typedef void FuncType(void *, MR_Box *, MR_NestedCont);
FuncType *code = (FuncType *)
@@ -562,8 +564,8 @@
#else
static void
-ML_call_goal_non(MR_Type_Info type_info, MR_Pred closure, MR_Box *result,
- MR_Cont cont, void *cont_env)
+ML_call_goal_non(MR_Mercury_Type_Info type_info,
+ MR_Pred closure, MR_Box *result, MR_Cont cont, void *cont_env)
{
typedef void FuncType(void *, MR_Box *, MR_Cont, void *);
FuncType *code = (FuncType *)
@@ -576,8 +578,8 @@
/*---------------------------------------------------------------------------*/
static void
-ML_call_handler_det(MR_Type_Info type_info, MR_Pred closure, MR_Univ exception,
- MR_Box *result)
+ML_call_handler_det(MR_Mercury_Type_Info type_info,
+ MR_Pred closure, MR_Univ exception, MR_Box *result)
{
typedef void FuncType(void *, MR_Box, MR_Box *);
FuncType *code = (FuncType *)
@@ -615,7 +617,7 @@
}
void
-mercury__exception__builtin_catch_model_det(MR_Type_Info type_info,
+mercury__exception__builtin_catch_model_det(MR_Mercury_Type_Info type_info,
MR_Pred pred, MR_Pred handler_pred, MR_Box *output)
{
ML_ExceptionHandler this_handler;
@@ -643,7 +645,7 @@
}
bool
-mercury__exception__builtin_catch_model_semi(MR_Type_Info type_info,
+mercury__exception__builtin_catch_model_semi(MR_Mercury_Type_Info type_info,
MR_Pred pred, MR_Pred handler_pred, MR_Box *output)
{
ML_ExceptionHandler this_handler;
@@ -675,7 +677,7 @@
#ifdef MR_USE_GCC_NESTED_FUNCTIONS
void
-mercury__exception__builtin_catch_model_non(MR_Type_Info type_info,
+mercury__exception__builtin_catch_model_non(MR_Mercury_Type_Info type_info,
MR_Pred pred, MR_Pred handler_pred, MR_Box *output,
MR_NestedCont cont)
{
@@ -755,7 +757,7 @@
}
void
-mercury__exception__builtin_catch_model_non(MR_Type_Info type_info,
+mercury__exception__builtin_catch_model_non(MR_Mercury_Type_Info type_info,
MR_Pred pred, MR_Pred handler_pred, MR_Box *output,
MR_Cont cont, void *cont_env)
{
Index: runtime/mercury.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.c,v
retrieving revision 1.12
diff -u -d -r1.12 mercury.c
--- runtime/mercury.c 2000/10/13 13:37:10 1.12
+++ runtime/mercury.c 2000/10/23 14:56:25
@@ -36,27 +36,32 @@
/* Types for the wrapper versions of type-specific unify/compare procedures. */
typedef bool MR_UnifyFunc_0(MR_Box, MR_Box);
-typedef bool MR_UnifyFunc_1(MR_Type_Info, MR_Box, MR_Box);
-typedef bool MR_UnifyFunc_2(MR_Type_Info, MR_Type_Info, MR_Box, MR_Box);
-typedef bool MR_UnifyFunc_3(MR_Type_Info, MR_Type_Info, MR_Type_Info,
+typedef bool MR_UnifyFunc_1(MR_Mercury_Type_Info, MR_Box, MR_Box);
+typedef bool MR_UnifyFunc_2(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
MR_Box, MR_Box);
-typedef bool MR_UnifyFunc_4(MR_Type_Info, MR_Type_Info, MR_Type_Info,
- MR_Type_Info, MR_Box, MR_Box);
-typedef bool MR_UnifyFunc_5(MR_Type_Info, MR_Type_Info, MR_Type_Info,
- MR_Type_Info, MR_Type_Info, MR_Box, MR_Box);
+typedef bool MR_UnifyFunc_3(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Box, MR_Box);
+typedef bool MR_UnifyFunc_4(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Box, MR_Box);
+typedef bool MR_UnifyFunc_5(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Box, MR_Box);
typedef void MR_CompareFunc_0(MR_Comparison_Result *, MR_Box, MR_Box);
-typedef void MR_CompareFunc_1(MR_Type_Info,
+typedef void MR_CompareFunc_1(MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-typedef void MR_CompareFunc_2(MR_Type_Info, MR_Type_Info,
+typedef void MR_CompareFunc_2(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-typedef void MR_CompareFunc_3(MR_Type_Info, MR_Type_Info, MR_Type_Info,
+typedef void MR_CompareFunc_3(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-typedef void MR_CompareFunc_4(MR_Type_Info, MR_Type_Info, MR_Type_Info,
- MR_Type_Info,
+typedef void MR_CompareFunc_4(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
-typedef void MR_CompareFunc_5(MR_Type_Info, MR_Type_Info, MR_Type_Info,
- MR_Type_Info, MR_Type_Info,
+typedef void MR_CompareFunc_5(MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info, MR_Mercury_Type_Info,
+ MR_Mercury_Type_Info,
MR_Comparison_Result *, MR_Box, MR_Box);
/*---------------------------------------------------------------------------*/
@@ -198,14 +203,14 @@
*/
bool
-mercury__builtin__unify_2_p_0(MR_Type_Info ti, MR_Box x, MR_Box y)
+mercury__builtin__unify_2_p_0(MR_Mercury_Type_Info ti, MR_Box x, MR_Box y)
{
MR_TypeInfo type_info;
MR_TypeCtorInfo type_ctor_info;
MR_TypeCtorRep type_ctor_rep;
int arity;
MR_TypeInfoParams params;
- MR_Type_Info *args;
+ MR_Mercury_Type_Info *args;
type_info = (MR_TypeInfo) ti;
type_ctor_info = MR_TYPEINFO_GET_TYPE_CTOR_INFO(type_info);
@@ -225,7 +230,7 @@
arity = type_ctor_info->arity;
params = MR_TYPEINFO_GET_FIRST_ORDER_ARG_VECTOR(type_info);
- args = (MR_Type_Info *) params;
+ args = (MR_Mercury_Type_Info *) params;
switch(arity) {
/*
@@ -255,15 +260,15 @@
}
void
-mercury__builtin__compare_3_p_0(MR_Type_Info ti, MR_Comparison_Result *res,
- MR_Box x, MR_Box y)
+mercury__builtin__compare_3_p_0(MR_Mercury_Type_Info ti,
+ MR_Comparison_Result *res, MR_Box x, MR_Box y)
{
MR_TypeInfo type_info;
MR_TypeCtorInfo type_ctor_info;
MR_TypeCtorRep type_ctor_rep;
int arity;
MR_TypeInfoParams params;
- MR_Type_Info *args;
+ MR_Mercury_Type_Info *args;
type_info = (MR_TypeInfo) ti;
type_ctor_info = MR_TYPEINFO_GET_TYPE_CTOR_INFO(type_info);
@@ -285,7 +290,7 @@
arity = type_ctor_info->arity;
params = MR_TYPEINFO_GET_FIRST_ORDER_ARG_VECTOR(type_info);
- args = (MR_Type_Info *) params;
+ args = (MR_Mercury_Type_Info *) params;
switch(arity) {
/*
@@ -321,21 +326,21 @@
void
mercury__builtin__compare_3_p_1(
- MR_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
{
mercury__builtin__compare_3_p_0(type_info, res, x, y);
}
void
mercury__builtin__compare_3_p_2(
- MR_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
{
mercury__builtin__compare_3_p_0(type_info, res, x, y);
}
void
mercury__builtin__compare_3_p_3(
- MR_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *res, MR_Box x, MR_Box y)
{
mercury__builtin__compare_3_p_0(type_info, res, x, y);
}
@@ -409,7 +414,8 @@
}
bool
-mercury__builtin____Unify____tuple_0_0(MR_Type_Info ti, MR_Tuple x, MR_Tuple y)
+mercury__builtin____Unify____tuple_0_0(MR_Mercury_Type_Info ti,
+ MR_Tuple x, MR_Tuple y)
{
int i, arity;
bool result;
@@ -424,7 +430,7 @@
arg_type_info =
MR_TYPEINFO_GET_TUPLE_ARG_VECTOR(type_info)[i + 1];
result = mercury__builtin__unify_2_p_0(
- (MR_Type_Info) arg_type_info, x[i], y[i]);
+ (MR_Mercury_Type_Info) arg_type_info, x[i], y[i]);
if (result == FALSE) {
return FALSE;
}
@@ -433,7 +439,7 @@
}
bool
-mercury__array____Unify____array_1_0(MR_Type_Info type_info,
+mercury__array____Unify____array_1_0(MR_Mercury_Type_Info type_info,
MR_Array x, MR_Array y)
{
SORRY("unify for array");
@@ -455,7 +461,7 @@
return FALSE;
}
- return mercury__builtin__unify_2_p_0((MR_Type_Info) typeinfo_x,
+ return mercury__builtin__unify_2_p_0((MR_Mercury_Type_Info) typeinfo_x,
(MR_Box) value_x, (MR_Box) value_y);
}
@@ -467,29 +473,32 @@
bool
mercury__private_builtin____Unify____type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Type_Ctor_Info x, MR_Type_Ctor_Info y)
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_Type_Ctor_Info x, MR_Mercury_Type_Ctor_Info y)
{
SORRY("unify for type_ctor_info");
}
bool
mercury__private_builtin____Unify____type_info_1_0(
- MR_Type_Info type_info, MR_Type_Info x, MR_Type_Info y)
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_Type_Info x, MR_Mercury_Type_Info y)
{
SORRY("unify for type_info");
}
bool
mercury__private_builtin____Unify____typeclass_info_1_0(
- MR_Type_Info type_info, MR_TypeClass_Info x, MR_TypeClass_Info y)
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_TypeClass_Info x, MR_Mercury_TypeClass_Info y)
{
SORRY("unify for typeclass_info");
}
bool
mercury__private_builtin____Unify____base_typeclass_info_1_0(
- MR_Type_Info type_info,
- MR_Base_TypeClass_Info x, MR_Base_TypeClass_Info y)
+ MR_Mercury_Type_Info type_info,
+ MR_Mercury_Base_TypeClass_Info x, MR_Mercury_Base_TypeClass_Info y)
{
SORRY("unify for base_typeclass_info");
}
@@ -572,7 +581,7 @@
}
void
-mercury__builtin____Compare____tuple_0_0(MR_Type_Info ti,
+mercury__builtin____Compare____tuple_0_0(MR_Mercury_Type_Info ti,
MR_Comparison_Result *result, MR_Tuple x, MR_Tuple y)
{
int i, arity;
@@ -586,7 +595,7 @@
/* type_infos are counted starting at one. */
arg_type_info =
MR_TYPEINFO_GET_TUPLE_ARG_VECTOR(type_info)[i + 1];
- mercury__builtin__compare_3_p_0((MR_Type_Info) arg_type_info,
+ mercury__builtin__compare_3_p_0((MR_Mercury_Type_Info) arg_type_info,
result, x[i], y[i]);
if (*result != MR_COMPARE_EQUAL) {
return;
@@ -597,7 +606,7 @@
void
mercury__array____Compare____array_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Array x, MR_Array y)
{
SORRY("compare for array");
@@ -621,7 +630,7 @@
return;
}
- return mercury__builtin__compare_3_p_0((MR_Type_Info) typeinfo_x,
+ return mercury__builtin__compare_3_p_0((MR_Mercury_Type_Info) typeinfo_x,
result, (MR_Box) value_x, (MR_Box) value_y);
}
@@ -634,31 +643,32 @@
void
mercury__private_builtin____Compare____type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_Type_Ctor_Info x, MR_Type_Ctor_Info y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Ctor_Info x, MR_Mercury_Type_Ctor_Info y)
{
SORRY("compare for type_ctor_info");
}
void
mercury__private_builtin____Compare____type_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result, MR_Type_Info x, MR_Type_Info y)
+ MR_Mercury_Type_Info type_info,
+ MR_Comparison_Result *result, MR_Mercury_Type_Info x, MR_Mercury_Type_Info y)
{
SORRY("compare for type_info");
}
void
mercury__private_builtin____Compare____typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_TypeClass_Info x, MR_TypeClass_Info y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_TypeClass_Info x, MR_Mercury_TypeClass_Info y)
{
SORRY("compare for typeclass_info");
}
void
mercury__private_builtin____Compare____base_typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
- MR_Base_TypeClass_Info x, MR_Base_TypeClass_Info y)
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Base_TypeClass_Info x, MR_Mercury_Base_TypeClass_Info y)
{
SORRY("compare for base_typeclass_info");
}
@@ -723,7 +733,7 @@
}
static bool
-mercury__builtin__do_unify__tuple_0_0(MR_Type_Info type_info,
+mercury__builtin__do_unify__tuple_0_0(MR_Mercury_Type_Info type_info,
MR_Box x, MR_Box y)
{
return mercury__builtin____Unify____tuple_0_0(
@@ -731,7 +741,8 @@
}
static bool
-mercury__array__do_unify__array_1_0(MR_Type_Info type_info, MR_Box x, MR_Box y)
+mercury__array__do_unify__array_1_0(MR_Mercury_Type_Info type_info,
+ MR_Box x, MR_Box y)
{
return mercury__array____Unify____array_1_0(
type_info, (MR_Array) x, (MR_Array) y);
@@ -753,35 +764,36 @@
static bool
mercury__private_builtin__do_unify__type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Box x, MR_Box y)
{
return mercury__private_builtin____Unify____type_ctor_info_1_0(
- type_info, (MR_Type_Ctor_Info) x, (MR_Type_Ctor_Info) y);
+ type_info, (MR_Mercury_Type_Ctor_Info) x, (MR_Mercury_Type_Ctor_Info) y);
}
static bool
mercury__private_builtin__do_unify__type_info_1_0(
- MR_Type_Info type_info, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Box x, MR_Box y)
{
return mercury__private_builtin____Unify____type_info_1_0(
- type_info, (MR_Type_Info) x, (MR_Type_Info) y);
+ type_info, (MR_Mercury_Type_Info) x, (MR_Mercury_Type_Info) y);
}
static bool
mercury__private_builtin__do_unify__typeclass_info_1_0(
- MR_Type_Info type_info, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Box x, MR_Box y)
{
return mercury__private_builtin____Unify____typeclass_info_1_0(
- type_info, (MR_TypeClass_Info) x, (MR_TypeClass_Info) y);
+ type_info, (MR_Mercury_TypeClass_Info) x, (MR_Mercury_TypeClass_Info) y);
}
static bool
mercury__private_builtin__do_unify__base_typeclass_info_1_0(
- MR_Type_Info type_info, MR_Box x, MR_Box y)
+ MR_Mercury_Type_Info type_info, MR_Box x, MR_Box y)
{
return mercury__private_builtin____Unify____base_typeclass_info_1_0(
type_info,
- (MR_Base_TypeClass_Info) x, (MR_Base_TypeClass_Info) y);
+ (MR_Mercury_Base_TypeClass_Info) x,
+ (MR_Mercury_Base_TypeClass_Info) y);
}
/*---------------------------------------------------------------------------*/
@@ -853,7 +865,7 @@
static void
mercury__builtin__do_compare__tuple_0_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__builtin____Compare____tuple_0_0(
@@ -862,7 +874,7 @@
static void
mercury__array__do_compare__array_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__array____Compare____array_1_0(
@@ -887,41 +899,42 @@
static void
mercury__private_builtin__do_compare__type_ctor_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__private_builtin____Compare____type_ctor_info_1_0(
type_info, result,
- (MR_Type_Ctor_Info) x, (MR_Type_Ctor_Info) y);
+ (MR_Mercury_Type_Ctor_Info) x, (MR_Mercury_Type_Ctor_Info) y);
}
static void
mercury__private_builtin__do_compare__type_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__private_builtin____Compare____type_info_1_0(
- type_info, result, (MR_Type_Info) x, (MR_Type_Info) y);
+ type_info, result, (MR_Mercury_Type_Info) x, (MR_Mercury_Type_Info) y);
}
static void
mercury__private_builtin__do_compare__typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__private_builtin____Compare____typeclass_info_1_0(
type_info, result,
- (MR_TypeClass_Info) x, (MR_TypeClass_Info) y);
+ (MR_Mercury_TypeClass_Info) x, (MR_Mercury_TypeClass_Info) y);
}
static void
mercury__private_builtin__do_compare__base_typeclass_info_1_0(
- MR_Type_Info type_info, MR_Comparison_Result *result,
+ MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
MR_Box x, MR_Box y)
{
mercury__private_builtin____Compare____base_typeclass_info_1_0(
type_info, result,
- (MR_Base_TypeClass_Info) x, (MR_Base_TypeClass_Info) y);
+ (MR_Mercury_Base_TypeClass_Info) x,
+ (MR_Mercury_Base_TypeClass_Info) y);
}
/*---------------------------------------------------------------------------*/
@@ -933,7 +946,8 @@
MR_Word
create1(MR_Word w1)
{
- MR_Word *p = (MR_Word *) MR_new_object(MR_Word, 1 * sizeof(MR_Word), "create1");
+ MR_Word *p = (MR_Word *) MR_new_object(MR_Word,
+ 1 * sizeof(MR_Word), "create1");
p[0] = w1;
return (MR_Word) p;
}
@@ -941,7 +955,8 @@
MR_Word
create2(MR_Word w1, MR_Word w2)
{
- MR_Word *p = (MR_Word *) MR_new_object(MR_Word, 2 * sizeof(MR_Word), "create2");
+ MR_Word *p = (MR_Word *) MR_new_object(MR_Word,
+ 2 * sizeof(MR_Word), "create2");
p[0] = w1;
p[1] = w2;
return (MR_Word) p;
@@ -950,7 +965,8 @@
MR_Word
create3(MR_Word w1, MR_Word w2, MR_Word w3)
{
- MR_Word *p = (MR_Word *) MR_new_object(MR_Word, 3 * sizeof(MR_Word), "create3");
+ MR_Word *p = (MR_Word *) MR_new_object(MR_Word,
+ 3 * sizeof(MR_Word), "create3");
p[0] = w1;
p[1] = w2;
p[2] = w3;
--
Fergus Henderson <fjh at cs.mu.oz.au> | "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-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
--------------------------------------------------------------------------
More information about the developers
mailing list