mercury_builtin.m: remove type_to_term and term_to_type

Fergus Henderson fjh at cs.mu.oz.au
Sat Jul 26 20:11:08 AEST 1997


library/mercury_builtin.m:
	Remove obsolete `#ifdef USE_TYPE_TO_TERM' code.
	`type_to_term' is now handled in term.m using arg, functor,
	deconstruct, etc. rather than being special-cased here.

Index: mercury_builtin.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/mercury_builtin.m,v
retrieving revision 1.78
diff -u -r1.78 mercury_builtin.m
--- mercury_builtin.m	1997/07/21 12:17:11	1.78
+++ mercury_builtin.m	1997/07/26 10:02:28
@@ -433,14 +456,10 @@
 	Code *f2;
 	Code *f3;
 	Code *f4;
-#ifdef USE_TYPE_TO_TERM
-	Code *f5;
-	Code *f6;
-#endif
 #ifdef USE_TYPE_LAYOUT
+	const Word *f5;
+	const Word *f6;
 	const Word *f7;
-	const Word *f8;
-	const Word *f9;
 #endif
 } mercury_data___base_type_info_int_0 = {
 	((Integer) 0),
@@ -465,14 +484,10 @@
 	Code *f2;
 	Code *f3;
 	Code *f4;
-#ifdef USE_TYPE_TO_TERM
-	Code *f5;
-	Code *f6;
-#endif
 #ifdef USE_TYPE_LAYOUT
+	const Word *f5;
+	const Word *f6;
 	const Word *f7;
-	const Word *f8;
-	const Word *f9;
 #endif
 } mercury_data___base_type_info_character_0 = {
 	((Integer) 0),
@@ -496,14 +511,10 @@
 	Code *f2;
 	Code *f3;
 	Code *f4;
-#ifdef USE_TYPE_TO_TERM
-	Code *f5;
-	Code *f6;
-#endif
 #ifdef USE_TYPE_LAYOUT
+	const Word *f5;
+	const Word *f6;
 	const Word *f7;
-	const Word *f8;
-	const Word *f9;
 #endif
 } mercury_data___base_type_info_string_0 = {
 	((Integer) 0),
@@ -527,14 +538,10 @@
 	Code *f2;
 	Code *f3;
 	Code *f4;
-#ifdef USE_TYPE_TO_TERM
-	Code *f5;
-	Code *f6;
-#endif
 #ifdef USE_TYPE_LAYOUT
+	const Word *f5;
+	const Word *f6;
 	const Word *f7;
-	const Word *f8;
-	const Word *f9;
 #endif
 } mercury_data___base_type_info_float_0 = {
 	((Integer) 0),
@@ -556,24 +563,16 @@
 	Code *f2;
 	Code *f3;
 	Code *f4;
-#ifdef USE_TYPE_TO_TERM
-	Code *f5;
-	Code *f6;
-#endif
 #ifdef USE_TYPE_LAYOUT
+	const Word *f5;
+	const Word *f6;
 	const Word *f7;
-	const Word *f8;
-	const Word *f9;
 #endif
 } mercury_data___base_type_info_void_0 = {
 	((Integer) 0),
 	MR_MAYBE_STATIC_CODE(ENTRY(mercury__unused_0_0)),
 	MR_MAYBE_STATIC_CODE(ENTRY(mercury__unused_0_0)),
 	MR_MAYBE_STATIC_CODE(ENTRY(mercury__unused_0_0)),
-#ifdef USE_TYPE_TO_TERM
-	MR_MAYBE_STATIC_CODE(ENTRY(mercury__unused_0_0)),
-	MR_MAYBE_STATIC_CODE(ENTRY(mercury__unused_0_0))
-#endif
 #ifdef  USE_TYPE_LAYOUT
 	(const Word *) & mercury_data___base_type_layout_void_0,
 	(const Word *) & mercury_data___base_type_functors_void_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.



More information about the developers mailing list