diff: rename base_type* to type_ctor* in extras

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Mar 24 19:53:28 AEDT 1999


Estimated hours taken: 0.25

extras/exceptions/exception.m:
extras/clpr/cfloat.m:
	Rename base_type* as type_ctor*, using Tyson's sed script,
	to match Tyson's changes to runtime/* and elsewhere.

Index: extras/clpr/cfloat.m
===================================================================
RCS file: /home/mercury1/repository/clpr/cfloat.m,v
retrieving revision 1.20
diff -u -r1.20 cfloat.m
--- cfloat.m	1998/09/04 11:25:59	1.20
+++ cfloat.m	1999/03/24 08:42:32
@@ -869,23 +869,23 @@
 
 :- pragma c_code("
 
-	/* base_type_functors for `cfloat' */
+	/* type_ctor_functors for `cfloat' */
 
 MR_MODULE_STATIC_OR_EXTERN
-const struct mercury_data_cfloat__base_type_functors_cfloat_0_struct {
+const struct mercury_data_cfloat__type_ctor_functors_cfloat_0_struct {
 	Integer f1;
-} mercury_data_cfloat__base_type_functors_cfloat_0 = {
-	MR_TYPEFUNCTORS_SPECIAL
+} mercury_data_cfloat__type_ctor_functors_cfloat_0 = {
+	MR_TYPE_CTOR_FUNCTORS_SPECIAL
 };
 
-	/* base_type_layout for `cfloat' */
+	/* type_ctor_layout for `cfloat' */
 
 MR_MODULE_STATIC_OR_EXTERN
-const struct mercury_data_cfloat__base_type_layout_cfloat_0_struct {
+const struct mercury_data_cfloat__type_ctor_layout_cfloat_0_struct {
 	TYPE_LAYOUT_FIELDS
-} mercury_data_cfloat__base_type_layout_cfloat_0 = {
-	make_typelayout_for_all_tags(TYPELAYOUT_CONST_TAG, 
-		mkbody(TYPELAYOUT_C_POINTER_VALUE))
+} mercury_data_cfloat__type_ctor_layout_cfloat_0 = {
+	make_typelayout_for_all_tags(TYPE_CTOR_LAYOUT_CONST_TAG, 
+		mkbody(TYPE_CTOR_LAYOUT_C_POINTER_VALUE))
 };
 
 	/* unify/2, compare/3, and index/2 predicates for `cfloat' */
Index: extras/exceptions/exception.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/exceptions/exception.m,v
retrieving revision 1.2
diff -u -r1.2 exception.m
--- exception.m	1998/12/14 16:05:11	1.2
+++ exception.m	1999/03/24 08:45:41
@@ -466,7 +466,7 @@
 	#include <assert.h>
 	#include ""mercury_deep_copy.h""
 
-	MR_DECLARE_STRUCT(mercury_data_std_util__base_type_info_univ_0);
+	MR_DECLARE_STRUCT(mercury_data_std_util__type_ctor_info_univ_0);
 ").
 
 :- pragma c_code("
@@ -1059,7 +1059,7 @@
 	assert(FRAMEVARS->heap_ptr <= FRAMEVARS->heap_zone->top);
 	save_transient_registers();
 	exception = deep_copy((Word *) exception,
-		(Word *) &mercury_data_std_util__base_type_info_univ_0,
+		(Word *) &mercury_data_std_util__type_ctor_info_univ_0,
 		FRAMEVARS->heap_ptr, FRAMEVARS->heap_zone->top);
 	restore_transient_registers();
 
@@ -1074,7 +1074,7 @@
 	assert(FRAMEVARS->solns_heap_ptr <= MR_solutions_heap_zone->top);
 	save_transient_registers();
 	exception = deep_copy((Word *) exception,
-		(Word *) &mercury_data_std_util__base_type_info_univ_0,
+		(Word *) &mercury_data_std_util__type_ctor_info_univ_0,
 		saved_solns_heap_ptr, MR_solutions_heap_zone->top);
 	restore_transient_registers();
 

-- 
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