[m-dev.] diff: USE_TYPE_TO_TERM

[Zoltan Somogyi]

runtime/mercury_conf_param.h:
runtime/mercury_type_info.h:
	Remove support for USE_TYPE_TO_TERM. This is way overdue;
	the compiler's support was removed in may of 1997 ...

Zoltan.

cvs diff: Diffing .
Index: mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.32
diff -u -b -r1.32 mercury_conf_param.h
--- mercury_conf_param.h	2000/01/05 16:40:17	1.32
+++ mercury_conf_param.h	2000/01/10 08:28:07
@@ -70,10 +70,6 @@
 **	Use C's `float' rather than C's `double' for the
 **	Mercury floating point type (`Float').
 **
-** USE_TYPE_TO_TERM:
-**	Include `type_to_term' and `term_to_type' fields in type_infos.
-**	[This is obsolete. USE_TYPE_LAYOUT is a better solution.]
-**
 ** PARALLEL
 **	Enable support for parallelism [not yet working].
 **
Index: mercury_type_info.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.34
diff -u -b -r1.34 mercury_type_info.h
--- mercury_type_info.h	1999/12/21 09:45:17	1.34
+++ mercury_type_info.h	2000/01/10 08:28:28
@@ -419,8 +419,6 @@
 
   #define MR_STATIC_CODE_CONST
 
-  #ifdef USE_TYPE_TO_TERM
-
     #define	MR_INIT_BUILTIN_TYPE_CTOR_INFO(B, T) \
     do {								\
 	MR_INIT_CODE_ADDR(B, mercury__builtin_unify##T##2_0, 		\
@@ -429,10 +427,6 @@
 		OFFSET_FOR_INDEX_PRED);					\
 	MR_INIT_CODE_ADDR(B, mercury__builtin_compare##T##3_0, 		\
 		OFFSET_FOR_COMPARE_PRED);				\
-	MR_INIT_CODE_ADDR(B, mercury__builtin_type_to_term##T##2_0,	\
-		OFFSET_FOR_TYPE_TO_TERM_PRED);				\
-	MR_INIT_CODE_ADDR(B, mercury__builtin_term_to_type##T##2_0,	\
-		OFFSET_FOR_TERM_TO_TYPE_PRED);				\
     } while (0)
 
     #define	MR_INIT_TYPE_CTOR_INFO_WITH_PRED(B, P)			\
@@ -440,8 +434,6 @@
 	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_UNIFY_PRED);			\
 	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_INDEX_PRED);			\
 	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_COMPARE_PRED);		\
-	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_TYPE_TO_TERM_PRED);		\
-	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_TERM_TO_TYPE_PRED);		\
     } while (0)
 
     #define	MR_INIT_TYPE_CTOR_INFO(B, T) \
@@ -449,37 +441,7 @@
 	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_UNIFY_PRED, Unify);	\
 	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_INDEX_PRED, Index);	\
 	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_COMPARE_PRED, Compare);	\
-	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_TERM_TO_TYPE_PRED, Term_To_Type);\
-	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_TYPE_TO_TERM_PRED, Type_To_Term);\
-    } while (0)
-
-  #else /* not USE_TYPE_TO_TERM */ 
-
-    #define	MR_INIT_BUILTIN_TYPE_CTOR_INFO(B, T) \
-    do {								\
-	MR_INIT_CODE_ADDR(B, mercury__builtin_unify##T##2_0, 	\
-		OFFSET_FOR_UNIFY_PRED);					\
-	MR_INIT_CODE_ADDR(B, mercury__builtin_index##T##2_0, 	\
-		OFFSET_FOR_INDEX_PRED);					\
-	MR_INIT_CODE_ADDR(B, mercury__builtin_compare##T##3_0, 	\
-		OFFSET_FOR_COMPARE_PRED);				\
     } while (0)
-
-    #define	MR_INIT_TYPE_CTOR_INFO_WITH_PRED(B, P)			\
-    do {								\
-	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_UNIFY_PRED);			\
-	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_INDEX_PRED);			\
-	MR_INIT_CODE_ADDR(B, P, OFFSET_FOR_COMPARE_PRED);		\
-    } while (0)
-
-    #define	MR_INIT_TYPE_CTOR_INFO(B, T) \
-    do {	\
-	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_UNIFY_PRED, Unify);     \
-	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_INDEX_PRED, Index);     \
-	MR_SPECIAL_PRED_INIT(B, T, OFFSET_FOR_COMPARE_PRED, Compare); \
-    } while (0)
-
-    #endif /* not USE_TYPE_TO_TERM */
 
 #else	/* MR_STATIC_CODE_ADDRESSES */
 
cvs diff: Diffing GETOPT
cvs diff: Diffing machdeps
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------