[m-dev.] diff: disable DD without GC

[Mark Anthony BROWN]

Estimated hours taken: 1

Disable the support for declarative debugging in grades without
conservative GC.  This was meant to be part of an earlier change,
but somehow did not get committed.

configure.in:
runtime/mercury_conf.h.in:
	Define MR_DISABLE_DECLARATIVE_DEBUGGER if --disable-decl-debug
	is passed as an option to `configure'.

runtime/mercury_conf_param.h:
	Define MR_USE_DECLARATIVE_DEBUGGER if conservative GC is being
	used, and declarative debugging has not been disabled.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.199
diff -u -r1.199 configure.in
--- configure.in	1999/12/23 03:15:30	1.199
+++ configure.in	2000/01/05 16:15:12
@@ -1692,8 +1692,8 @@
 AC_ARG_ENABLE(decl-debug,
 [  --disable-decl-debug    disable the declarative debugger],
 mercury_cv_enable_decl_debug="$enableval",mercury_cv_enable_decl_debug=yes)
-if test "$mercury_cv_enable_decl_debug" = "yes"; then
-	AC_DEFINE(MR_USE_DECLARATIVE_DEBUGGER)
+if test "$mercury_cv_enable_decl_debug" = "no"; then
+	AC_DEFINE(MR_DISABLE_DECLARATIVE_DEBUGGER)
 fi
 #-----------------------------------------------------------------------------#
 
Index: runtime/mercury_conf.h.in
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf.h.in,v
retrieving revision 1.24
diff -u -r1.24 mercury_conf.h.in
--- runtime/mercury_conf.h.in	1999/10/28 06:27:20	1.24
+++ runtime/mercury_conf.h.in	2000/01/05 16:15:54
@@ -320,10 +320,13 @@
 #undef  MR_USE_EXTERNAL_DEBUGGER
 
 /*
-** MR_USE_DECLARATIVE_DEBUGGER:
-**	Include declarative debugging support in the internal debugger.
+** MR_DISABLE_DECLARATIVE_DEBUGGER:
+**	Remove declarative debugging support from the internal
+**	debugger, even if it is compatible with the current grade.
+**	Whether the declarative debugger can be used or not is
+**	determined in runtime/mercury_conf_param.h.
 */
-#undef	MR_USE_DECLARATIVE_DEBUGGER
+#undef	MR_DISABLE_DECLARATIVE_DEBUGGER
 
 /*
 ** MR_NO_USE_READLINE
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.31
diff -u -r1.31 mercury_conf_param.h
--- runtime/mercury_conf_param.h	2000/01/03 08:53:06	1.31
+++ runtime/mercury_conf_param.h	2000/01/05 16:15:57
@@ -323,6 +323,15 @@
   #define MR_MAY_NEED_INITIALIZATION
 #endif
 
+/*
+** MR_USE_DECLARATIVE_DEBUGGER -- include support for declarative
+**				  debugging in the internal debugger.
+*/
+
+#if defined(CONSERVATIVE_GC) && !defined(MR_DISABLE_DECLARATIVE_DEBUGGER)
+  #define MR_USE_DECLARATIVE_DEBUGGER
+#endif
+
 /*---------------------------------------------------------------------------*/
 
 /*
-- 
Mark Brown, PhD student            )O+  |  "Another of Fortran's breakthroughs
(m.brown at cs.mu.oz.au)                   |  was the GOTO statement, which was...
Dept. of Computer Science and Software  |  uniquely simple and understandable"
Engineering, University of Melbourne    |              -- IEEE, 1994
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------