[m-dev.] diff: undefine MR_BOOTSTRAP_RTTI_CHANGE

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.25


compiler/mlds_to_c.m:
runtime/mercury.h:
    Remove references to MR_BOOTSTRAP_RTTI_CHANGE, as the change has now
    bootstrapped.  They cannot be left in as some handwritten C code in
    the trace directory refers to compiler generated header files and
    there is no easy way to determine for this code whether or not to
    set the MR_BOOTSTRAP_RTTI_CHANGE macro.


Index: compiler/mlds_to_c.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds_to_c.m,v
retrieving revision 1.63
diff -u -r1.63 mlds_to_c.m
--- compiler/mlds_to_c.m	2000/11/03 15:51:28	1.63
+++ compiler/mlds_to_c.m	2000/11/06 10:38:33
@@ -289,10 +289,14 @@
 		mercury_module_name_to_mlds(ModuleName)),
 	io__nl.
 
+	%
+	% Output any #defines which are required to bootstrap in the hlc
+	% grade.
+	%
 :- pred mlds_output_src_bootstrap_defines(io__state::di, io__state::uo) is det.
 
 mlds_output_src_bootstrap_defines -->
-	io__write_string("#define MR_BOOTSTRAP_RTTI_CHANGE\n").
+	[].
 
 :- pred mlds_output_hdr_end(indent, mercury_module_name,
 		io__state, io__state).
Index: runtime/mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.24
diff -u -r1.24 mercury.h
--- runtime/mercury.h	2000/11/03 15:51:32	1.24
+++ runtime/mercury.h	2000/11/06 10:38:34
@@ -138,22 +138,10 @@
 ** are defined here.
 */
 typedef struct MR_TypeCtorInfo_Struct	MR_TypeCtorInfo_Struct;
-
-#ifdef MR_BOOTSTRAP_RTTI_CHANGE
-  typedef const MR_EnumFunctorDesc *	MR_EnumFunctorDescPtr;
-  typedef const MR_DuFunctorDesc *	MR_DuFunctorDescPtr;
-  typedef union MR_TableNode_Union * *	MR_TableNodePtrPtr;
-  typedef MR_Box				MR_BaseTypeclassInfo;
-#else
-  typedef MR_DuExistLocn                 MR_DuExistLocnArray[];
-  typedef MR_ConstString                 MR_ConstStringArray[];
-  typedef MR_PseudoTypeInfo              MR_PseudoTypeInfoArray[];
-  typedef const MR_EnumFunctorDesc *     MR_EnumFunctorDescPtrArray[];
-  typedef const MR_DuFunctorDesc *       MR_DuFunctorDescPtrArray[];
-  typedef MR_DuPtagLayout                        MR_DuPtagLayoutArray[];
-  typedef union MR_TableNode_Union * *   MR_TableNodePtrPtr[];
-  typedef MR_Box                         MR_BaseTypeclassInfo[];
-#endif
+typedef const MR_EnumFunctorDesc *	MR_EnumFunctorDescPtr;
+typedef const MR_DuFunctorDesc *	MR_DuFunctorDescPtr;
+typedef union MR_TableNode_Union * *	MR_TableNodePtrPtr;
+typedef MR_Box				MR_BaseTypeclassInfo;
 
 
 /*

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