[m-rev.] diff: delete bootstrapping #defines

[Zoltan Somogyi]

trace/mercury_trace_vars.c:
	Refer to the type_ctor_infos of builtin types by their qualified names.

runtime/mercury_bootstrap.h:
	Remove definitions no longer needed for boostrapping.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing bench
cvs diff: Diffing bench/progs
cvs diff: Diffing bench/progs/compress
cvs diff: Diffing bench/progs/icfp2000
cvs diff: Diffing bench/progs/icfp2001
cvs diff: Diffing bench/progs/nuc
cvs diff: Diffing bench/progs/ray
cvs diff: Diffing bench/progs/tree234
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
Index: runtime/mercury_bootstrap.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v
retrieving revision 1.31
diff -u -b -r1.31 mercury_bootstrap.h
--- runtime/mercury_bootstrap.h	2002/08/09 05:26:48	1.31
+++ runtime/mercury_bootstrap.h	2002/09/01 10:38:08
@@ -15,132 +15,6 @@
 #ifndef	MERCURY_BOOTSTRAP_H
 #define	MERCURY_BOOTSTRAP_H
 
-#define	MR_FA_PseudoTypeInfo_Struct0_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct1_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct2_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct3_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct4_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct5_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct6_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct7_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct8_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct9_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct10_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct11_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct12_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct13_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct14_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct15_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct16_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct17_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct18_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct19_GUARD
-#define	MR_FA_PseudoTypeInfo_Struct20_GUARD
-
-#define	MR_VA_PseudoTypeInfo_Struct0_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct1_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct2_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct3_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct4_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct5_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct6_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct7_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct8_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct9_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct10_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct11_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct12_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct13_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct14_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct15_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct16_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct17_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct18_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct19_GUARD
-#define	MR_VA_PseudoTypeInfo_Struct20_GUARD
-
-#define	MR_FA_TypeInfo_Struct0_GUARD
-#define	MR_FA_TypeInfo_Struct1_GUARD
-#define	MR_FA_TypeInfo_Struct2_GUARD
-#define	MR_FA_TypeInfo_Struct3_GUARD
-#define	MR_FA_TypeInfo_Struct4_GUARD
-#define	MR_FA_TypeInfo_Struct5_GUARD
-#define	MR_FA_TypeInfo_Struct6_GUARD
-#define	MR_FA_TypeInfo_Struct7_GUARD
-#define	MR_FA_TypeInfo_Struct8_GUARD
-#define	MR_FA_TypeInfo_Struct9_GUARD
-#define	MR_FA_TypeInfo_Struct10_GUARD
-#define	MR_FA_TypeInfo_Struct11_GUARD
-#define	MR_FA_TypeInfo_Struct12_GUARD
-#define	MR_FA_TypeInfo_Struct13_GUARD
-#define	MR_FA_TypeInfo_Struct14_GUARD
-#define	MR_FA_TypeInfo_Struct15_GUARD
-#define	MR_FA_TypeInfo_Struct16_GUARD
-#define	MR_FA_TypeInfo_Struct17_GUARD
-#define	MR_FA_TypeInfo_Struct18_GUARD
-#define	MR_FA_TypeInfo_Struct19_GUARD
-#define	MR_FA_TypeInfo_Struct20_GUARD
-
-#define	MR_VA_TypeInfo_Struct0_GUARD
-#define	MR_VA_TypeInfo_Struct1_GUARD
-#define	MR_VA_TypeInfo_Struct2_GUARD
-#define	MR_VA_TypeInfo_Struct3_GUARD
-#define	MR_VA_TypeInfo_Struct4_GUARD
-#define	MR_VA_TypeInfo_Struct5_GUARD
-#define	MR_VA_TypeInfo_Struct6_GUARD
-#define	MR_VA_TypeInfo_Struct7_GUARD
-#define	MR_VA_TypeInfo_Struct8_GUARD
-#define	MR_VA_TypeInfo_Struct9_GUARD
-#define	MR_VA_TypeInfo_Struct10_GUARD
-#define	MR_VA_TypeInfo_Struct11_GUARD
-#define	MR_VA_TypeInfo_Struct12_GUARD
-#define	MR_VA_TypeInfo_Struct13_GUARD
-#define	MR_VA_TypeInfo_Struct14_GUARD
-#define	MR_VA_TypeInfo_Struct15_GUARD
-#define	MR_VA_TypeInfo_Struct16_GUARD
-#define	MR_VA_TypeInfo_Struct17_GUARD
-#define	MR_VA_TypeInfo_Struct18_GUARD
-#define	MR_VA_TypeInfo_Struct19_GUARD
-#define	MR_VA_TypeInfo_Struct20_GUARD
-
-/*
-** These will be needed until we regularize the module-qualification
-** of builtin types.
-*/
-
-#define	mercury_data___type_ctor_info_int_0 \
-	mercury_data_builtin__type_ctor_info_int_0
-#define	mercury_data___type_ctor_info_string_0 \
-	mercury_data_builtin__type_ctor_info_string_0
-#define	mercury_data___type_ctor_info_float_0 \
-	mercury_data_builtin__type_ctor_info_float_0
-#define	mercury_data___type_ctor_info_character_0 \
-	mercury_data_builtin__type_ctor_info_character_0
-#define	mercury_data___type_ctor_info_void_0 \
-	mercury_data_builtin__type_ctor_info_void_0
-#define	mercury_data___type_ctor_info_c_pointer_0 \
-	mercury_data_builtin__type_ctor_info_c_pointer_0
-#define	mercury_data___type_ctor_info_func_0 \
-	mercury_data_builtin__type_ctor_info_func_0
-#define	mercury_data___type_ctor_info_pred_0 \
-	mercury_data_builtin__type_ctor_info_pred_0
-#define	mercury_data___type_ctor_info_tuple_0 \
-	mercury_data_builtin__type_ctor_info_tuple_0
-#define	mercury_data___type_ctor_info_hp_0 \
-	mercury_data_builtin__type_ctor_info_hp_0
-#define	mercury_data___type_ctor_info_curfr_0 \
-	mercury_data_builtin__type_ctor_info_curfr_0
-#define	mercury_data___type_ctor_info_maxfr_0 \
-	mercury_data_builtin__type_ctor_info_maxfr_0
-#define	mercury_data___type_ctor_info_redofr_0 \
-	mercury_data_builtin__type_ctor_info_redofr_0
-#define	mercury_data___type_ctor_info_redoip_0 \
-	mercury_data_builtin__type_ctor_info_redoip_0
-#define	mercury_data___type_ctor_info_trailptr_0 \
-	mercury_data_builtin__type_ctor_info_trailptr_0
-#define	mercury_data___type_ctor_info_ticket_0 \
-	mercury_data_builtin__type_ctor_info_ticket_0
-
 /*
 ** This stuff is enabled by default,
 ** but you can disable it by defining MR_NO_BACKWARDS_COMPAT.
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
Index: trace/mercury_trace_vars.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_vars.c,v
retrieving revision 1.48
diff -u -b -r1.48 mercury_trace_vars.c
--- trace/mercury_trace_vars.c	2002/08/09 05:26:54	1.48
+++ trace/mercury_trace_vars.c	2002/08/13 12:53:41
@@ -163,25 +163,25 @@
   extern struct MR_TypeCtorInfo_Struct
     mercury_data_type_desc__type_ctor_info_type_ctor_desc_0;
   extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_func_0;
+    mercury_data_builtin__type_ctor_info_func_0;
   extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_pred_0;
+    mercury_data_builtin__type_ctor_info_pred_0;
   extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_void_0;
+    mercury_data_builtin__type_ctor_info_void_0;
 
   #ifdef MR_NATIVE_GC
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_succip_0;
+    mercury_data_builtin__type_ctor_info_succip_0;
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_hp_0;
+    mercury_data_builtin__type_ctor_info_hp_0;
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_curfr_0;
+    mercury_data_builtin__type_ctor_info_curfr_0;
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_maxfr_0;
+    mercury_data_builtin__type_ctor_info_maxfr_0;
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_redoip_0;
+    mercury_data_builtin__type_ctor_info_redoip_0;
     extern struct MR_TypeCtorInfo_Struct
-    mercury_data___type_ctor_info_redofr_0;
+    mercury_data_builtin__type_ctor_info_redofr_0;
   #endif
 #endif
 
@@ -195,16 +195,16 @@
     &mercury_data_private_builtin__type_ctor_info_base_typeclass_info_1,
 
     /* we ignore these because they should never be needed */
-    &mercury_data___type_ctor_info_void_0,
+    &mercury_data_builtin__type_ctor_info_void_0,
 
   #ifdef MR_NATIVE_GC
     /* we ignore these because they are not interesting */
-    &mercury_data___type_ctor_info_succip_0,
-    &mercury_data___type_ctor_info_hp_0,
-    &mercury_data___type_ctor_info_curfr_0,
-    &mercury_data___type_ctor_info_maxfr_0,
-    &mercury_data___type_ctor_info_redoip_0,
-    &mercury_data___type_ctor_info_redofr_0,
+    &mercury_data_builtin__type_ctor_info_succip_0,
+    &mercury_data_builtin__type_ctor_info_hp_0,
+    &mercury_data_builtin__type_ctor_info_curfr_0,
+    &mercury_data_builtin__type_ctor_info_maxfr_0,
+    &mercury_data_builtin__type_ctor_info_redoip_0,
+    &mercury_data_builtin__type_ctor_info_redofr_0,
   #endif
 #endif
     /* dummy member */
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------