[m-dev.] for review: avoid module name clashes in browser
Simon Taylor
stayl at cs.mu.OZ.AU
Fri Feb 4 12:53:14 AEDT 2000
Estimated hours taken: 1.5
Make all the modules in the browser library sub-modules of
module `mdb', to avoid link errors with user-defined modules
with names such as `parse'.
browser/Mmakefile:
browser/browser_library.m:
browser/mdb.m:
Rename browser_library.m to mdb.m.
Change `:- import_module' declarations to
`:- include_module' declarations.
browser/Mmakefile:
Remove the special case rule for `mer_browser.init' --
it doesn't work when the file names are not the same
as the module name. Instead, the default rule for `mdb.init'
is used and the output is copied to `mer_browser.init'.
browser/.cvsignore:
Rename header files, etc.
browser/*.m:
Add a `mdb__' prefix to the names of modules in the browser library
in `:- module' and `:- import_module' declarations.
trace/*.c:
Rename the header files for the browser library in
`#include' statements.
tests/hard_coded/Mmakefile:
tests/hard_coded/parse.m:
tests/hard_coded/parse.exp:
Test case.
Index: browser/.cvsignore
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/.cvsignore,v
retrieving revision 1.10
diff -u -u -r1.10 .cvsignore
--- .cvsignore 2000/01/13 06:37:24 1.10
+++ .cvsignore 2000/01/17 05:57:20
@@ -11,15 +11,15 @@
*.date
*.date3
*.pic_o
-help.h
-debugger_interface.h
-declarative_debugger.h
-declarative_execution.h
-browse.h
-interactive_query.h
+mdb.help.h
+mdb.debugger_interface.h
+mdb.declarative_debugger.h
+mdb.declarative_execution.h
+mdb.browse.h
+mdb.interactive_query.h
mer_browser.init
Mercury
-browser_library.dv
+mdb.dv
browse_test.dv
declarative_test.dv
collect_lib.h
Index: browser/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/Mmakefile,v
retrieving revision 1.7
diff -u -u -r1.7 Mmakefile
--- Mmakefile 1999/11/30 00:04:22 1.7
+++ Mmakefile 2000/01/18 00:37:14
@@ -87,41 +87,40 @@
all : library browse_test declarative_test
.PHONY: depend
-depend : browser_library.depend browse_test.depend \
- declarative_test.depend
+depend : mdb.depend browse_test.depend declarative_test.depend
.PHONY: check
-check : browser_library.check
+check : mdb.check
.PHONY: all-ints
all-ints: ints int3s
.PHONY: ints
-ints : browser_library.ints browse_test.ints declarative_test.ints
+ints : mdb.ints browse_test.ints declarative_test.ints
.PHONY: int3s
-int3s : browser_library.int3s
+int3s : mdb.int3s
#-----------------------------------------------------------------------------#
-tags : $(MTAGS) $(browser_library.ms)
- $(MTAGS) $(browser_library.ms) ../library/*.m
+tags : $(MTAGS) $(mdb.ms)
+ $(MTAGS) $(mdb.ms) ../library/*.m
-browser_library.stats : $(COMPILER_DIR)/source_stats.awk $(browser_library.ms)
+mdb.stats : $(COMPILER_DIR)/source_stats.awk $(mdb.ms)
awk -f $(COMPILER_DIR)/source_stats.awk \
- `vpath_find $(browser_library.ms)` > $@
+ `vpath_find $(mdb.ms)` > $@
#-----------------------------------------------------------------------------#
.PHONY: dates
dates :
- touch $(browser_library.dates)
+ touch $(mdb.dates)
#-----------------------------------------------------------------------------#
.PHONY: os cs
-os: $(browser_library.os)
-cs: $(browser_library.cs)
+os: $(mdb.os)
+cs: $(mdb.cs)
#-----------------------------------------------------------------------------#
@@ -129,37 +128,34 @@
library: lib$(BROWSER_LIB_NAME).a lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
library: $(BROWSER_LIB_NAME).init
-lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a : $(browser_library.os)
+lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a : $(mdb.os)
rm -f lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a
- ar cr lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a $(browser_library.os)
+ ar cr lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a $(mdb.os)
$(RANLIB) lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a
RPATH_1=$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_LIB_DIR)
RPATH_2=$(SHLIB_RPATH_SEP)$(FINAL_INSTALL_MERC_GC_LIB_DIR)
-lib$(BROWSER_LIB_NAME).so : $(browser_library.pic_os)
+lib$(BROWSER_LIB_NAME).so : $(mdb.pic_os)
$(LINK_SHARED_OBJ) -o lib$(BROWSER_LIB_NAME).so \
- $(browser_library.pic_os) \
+ $(mdb.pic_os) \
$(RPATH_1)$(RPATH_2) \
$(LDFLAGS) $(LDLIBS) \
$(SHARED_LIBS)
-$(BROWSER_LIB_NAME).init: $(deps_subdir)browser_library.dep
- for file in $(browser_library.ms); do \
- grep '^INIT ' $$file; \
- echo "INIT mercury__`basename $$file .m`__init"; \
- done > $(BROWSER_LIB_NAME).init
-
-# Ensure we recompile browser_library__version if VERSION is changed.
-$(os_subdir)browser_library.o \
-$(os_subdir)browser_library.pic_o \
+$(BROWSER_LIB_NAME).init: $(deps_subdir)mdb.dep mdb.init
+ cp mdb.init $(BROWSER_LIB_NAME).init
+
+# Ensure we recompile mdb__version if VERSION is changed.
+$(os_subdir)mdb.o \
+$(os_subdir)mdb.pic_o \
: $(RUNTIME_DIR)/mercury_conf.h
#-----------------------------------------------------------------------------#
realclean_local:
rm -f lib$(BROWSER_LIB_NAME).a lib$(BROWSER_LIB_NAME).so \
- $(BROWSER_LIB_NAME).init
+ $(BROWSER_LIB_NAME).init mdb.init
rm -f tags
#-----------------------------------------------------------------------------#
Index: browser/browse.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/browse.m,v
retrieving revision 1.10
diff -u -u -r1.10 browse.m
--- browse.m 1999/05/30 03:54:30 1.10
+++ browse.m 2000/01/05 04:21:32
@@ -16,7 +16,7 @@
% authors: aet
% stability: low
-:- module browse.
+:- module mdb__browse.
:- interface.
@@ -47,7 +47,7 @@
%---------------------------------------------------------------------------%
:- implementation.
-:- import_module parse, util, frame.
+:- import_module mdb__parse, mdb__util, mdb__frame.
:- import_module string, list, parser, require, std_util, int, char.
%---------------------------------------------------------------------------%
Index: browser/browse_test.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/browse_test.m,v
retrieving revision 1.2
diff -u -u -r1.2 browse_test.m
--- browse_test.m 1999/11/30 00:04:23 1.2
+++ browse_test.m 2000/01/05 04:37:49
@@ -20,7 +20,8 @@
:- implementation.
-:- import_module browse, list, string, int, std_util, tree234, assoc_list.
+:- import_module list, string, int, std_util, tree234, assoc_list.
+:- import_module mdb, mdb__browse.
main -->
{ Filename = "/etc/hosts" },
Index: browser/browser_library.m
===================================================================
RCS file: browser_library.m
diff -N browser_library.m
--- /tmp/cvsEAAaaviea Fri Feb 4 12:45:30 2000
+++ /dev/null Fri Feb 4 12:43:59 2000
@@ -1,35 +0,0 @@
-%---------------------------------------------------------------------------%
-% Copyright (C) 1998-2000 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-%---------------------------------------------------------------------------%
-
-:- module browser_library.
-
-:- interface.
-
-:- pred browser_library__version(string::out) is det.
-
-:- implementation.
-
-:- import_module browse, frame, help, parse, util.
-:- import_module debugger_interface.
-:- import_module declarative_debugger, declarative_oracle, declarative_user.
-:- import_module declarative_execution, declarative_analyser.
-:- import_module interactive_query, dl, name_mangle.
-:- import_module collect_lib.
-
-% See library/library.m for why we implement this predicate this way.
-
-:- pragma c_code(browser_library__version(Version::out),
- will_not_call_mercury, "
- ConstString version_string =
- MR_VERSION "", configured for "" MR_FULLARCH;
- /*
- ** Cast away const needed here, because Mercury declares Version
- ** with type String rather than ConstString.
- */
- Version = (String) (Word) version_string;
-").
-
-%---------------------------------------------------------------------------%
Index: browser/collect_lib.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/collect_lib.m,v
retrieving revision 1.3
diff -u -u -r1.3 collect_lib.m
--- collect_lib.m 2000/01/13 04:29:34 1.3
+++ collect_lib.m 2000/01/17 22:32:12
@@ -46,7 +46,7 @@
% execution. When the end of the execution is reached, the last value of
% the collecting variable is send to the debugger.
-:- module collect_lib.
+:- module mdb__collect_lib.
:- interface.
:- pred dummy_pred_to_avoid_warning_about_nothing_exported is det.
@@ -54,7 +54,7 @@
%------------------------------------------------------------------------------%
:- implementation.
:- import_module int, list, std_util, io, char.
-:- import_module dl.
+:- import_module mdb__dl.
dummy_pred_to_avoid_warning_about_nothing_exported.
Index: browser/debugger_interface.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/debugger_interface.m,v
retrieving revision 1.16
diff -u -u -r1.16 debugger_interface.m
--- debugger_interface.m 1999/11/30 00:04:23 1.16
+++ debugger_interface.m 2000/01/05 04:29:35
@@ -13,7 +13,7 @@
%
% This module corresponds to what is called the "Query Handler" in Opium.
-:- module debugger_interface.
+:- module mdb__debugger_interface.
:- interface.
% This module exports the following C functions:
@@ -32,7 +32,7 @@
:- implementation.
:- import_module io, require.
:- import_module list, bool, std_util.
-:- import_module interactive_query, util.
+:- import_module mdb__interactive_query, mdb__util.
dummy_pred_to_avoid_warning_about_nothing_exported.
Index: browser/declarative_analyser.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_analyser.m,v
retrieving revision 1.1
diff -u -u -r1.1 declarative_analyser.m
--- declarative_analyser.m 2000/01/03 02:20:26 1.1
+++ declarative_analyser.m 2000/01/05 06:26:42
@@ -10,10 +10,10 @@
% implements an analysis algorithm which finds bugs in such trees.
%
-:- module declarative_analyser.
+:- module mdb__declarative_analyser.
:- interface.
:- import_module list.
-:- import_module declarative_debugger.
+:- import_module mdb__declarative_debugger.
% This typeclass defines how EDTs may be accessed by this module.
% An EDT is a tree of nodes, each of which contains a question
Index: browser/declarative_debugger.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_debugger.m,v
retrieving revision 1.9
diff -u -u -r1.9 declarative_debugger.m
--- declarative_debugger.m 2000/01/21 02:46:06 1.9
+++ declarative_debugger.m 2000/02/01 05:25:51
@@ -19,10 +19,10 @@
% passed to diagnose a bug. It does this by a simple top-down search.
%
-:- module declarative_debugger.
+:- module mdb__declarative_debugger.
:- interface.
:- import_module io, list, bool, std_util.
-:- import_module declarative_execution.
+:- import_module mdb__declarative_execution.
% This type represents the possible truth values for nodes
% in the EDT.
@@ -86,7 +86,7 @@
:- implementation.
:- import_module require, int, char.
-:- import_module declarative_analyser, declarative_oracle.
+:- import_module mdb__declarative_analyser, mdb__declarative_oracle.
:- type diagnoser_state(R)
---> diagnoser(
Index: browser/declarative_execution.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_execution.m,v
retrieving revision 1.1
diff -u -u -r1.1 declarative_execution.m
--- declarative_execution.m 1999/11/30 00:04:24 1.1
+++ declarative_execution.m 1999/12/21 02:46:41
@@ -12,10 +12,10 @@
% from this module. The debugging front end analyses the structure
% to produce a bug diagnosis.
-:- module declarative_execution.
+:- module mdb__declarative_execution.
:- interface.
:- import_module bool, list, std_util, string, io.
-:- import_module util.
+:- import_module mdb__util.
% This type represents a port in a stored event trace.
% The type R is the type of references to other nodes
Index: browser/declarative_oracle.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_oracle.m,v
retrieving revision 1.5
diff -u -u -r1.5 declarative_oracle.m
--- declarative_oracle.m 2000/01/03 02:20:27 1.5
+++ declarative_oracle.m 2000/01/05 06:06:14
@@ -22,9 +22,9 @@
% the user will not be asked the same question twice.
%
-:- module declarative_oracle.
+:- module mdb__declarative_oracle.
:- interface.
-:- import_module declarative_debugger.
+:- import_module mdb__declarative_debugger.
:- import_module list, io.
% A response that the oracle gives to the caller.
@@ -57,7 +57,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module declarative_user, util.
+:- import_module mdb__declarative_user, mdb__util.
:- import_module bool, std_util, map, set.
query_oracle(Queries, Response, Oracle0, Oracle) -->
Index: browser/declarative_test.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_test.m,v
retrieving revision 1.2
diff -u -u -r1.2 declarative_test.m
--- declarative_test.m 2000/01/20 13:45:50 1.2
+++ declarative_test.m 2000/02/01 05:25:52
@@ -17,7 +17,7 @@
:- mode main(di, uo) is det.
:- implementation.
-:- import_module declarative_debugger, declarative_execution.
+:- import_module mdb, mdb__declarative_debugger, mdb__declarative_execution.
:- import_module list, std_util, map, require.
main -->
Index: browser/declarative_user.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/declarative_user.m,v
retrieving revision 1.3
diff -u -u -r1.3 declarative_user.m
--- declarative_user.m 2000/01/03 02:20:27 1.3
+++ declarative_user.m 2000/01/05 06:06:01
@@ -12,9 +12,9 @@
% debugger queries from the user.
%
-:- module declarative_user.
+:- module mdb__declarative_user.
:- interface.
-:- import_module declarative_debugger.
+:- import_module mdb__declarative_debugger.
:- import_module list, io.
:- type user_response
@@ -43,7 +43,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module declarative_execution, util.
+:- import_module mdb__declarative_execution, mdb__util.
:- import_module std_util, char, string, bool.
:- type user_state
Index: browser/dl.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/dl.m,v
retrieving revision 1.3
diff -u -u -r1.3 dl.m
--- dl.m 1999/11/15 10:13:07 1.3
+++ dl.m 2000/01/06 01:15:55
@@ -14,10 +14,10 @@
% see the documentation for those procedures (i.e. `man dlopen').
%-----------------------------------------------------------------------------%
-:- module dl.
+:- module mdb__dl.
:- interface.
:- import_module io.
-:- import_module name_mangle.
+:- import_module mdb__name_mangle.
:- type (mode) ---> lazy ; now. % RTLD_LAZY or RTLD_NOW
:- type scope ---> local ; global. % RTLD_GLOBAL or not.
Index: browser/frame.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/frame.m,v
retrieving revision 1.2
diff -u -u -r1.2 frame.m
--- frame.m 1999/03/10 20:20:08 1.2
+++ frame.m 2000/01/05 04:22:44
@@ -15,7 +15,7 @@
% authors: aet
% stability: low
-:- module frame.
+:- module mdb__frame.
:- interface.
@@ -56,7 +56,8 @@
%---------------------------------------------------------------------------%
:- implementation.
-:- import_module util, string, list, int, io, require.
+:- import_module string, list, int, io, require.
+:- import_module mdb__util.
frame__from_string(Str, [Str]).
Index: browser/help.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/help.m,v
retrieving revision 1.1
diff -u -u -r1.1 help.m
--- help.m 1998/09/29 05:10:10 1.1
+++ help.m 1999/12/21 02:44:45
@@ -19,7 +19,7 @@
%
%-----------------------------------------------------------------------------%
-:- module help.
+:- module mdb__help.
:- interface.
Index: browser/interactive_query.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/interactive_query.m,v
retrieving revision 1.6
diff -u -u -r1.6 interactive_query.m
--- interactive_query.m 1999/11/15 10:13:08 1.6
+++ interactive_query.m 2000/01/06 01:16:48
@@ -14,7 +14,7 @@
% from the file `libquery.so', looks up the address of the
% procedure query/2 in that module, and then calls that procedure.
-:- module interactive_query.
+:- module mdb__interactive_query.
:- interface.
:- import_module io, list.
@@ -34,7 +34,8 @@
:- implementation.
:- import_module std_util, bool, string, term, varset, term_io, parser.
-:- import_module dl, name_mangle, util.
+:- import_module mdb__dl, mdb__name_mangle.
+:- import_module mdb__util.
:- pragma export(query(in, in, in, in, in, di, uo), "ML_query").
Index: browser/mdb.m
===================================================================
RCS file: mdb.m
diff -N mdb.m
--- /dev/null Fri Feb 4 12:43:59 2000
+++ mdb.m Mon Jan 10 11:06:35 2000
@@ -0,0 +1,42 @@
+%---------------------------------------------------------------------------%
+% Copyright (C) 1998-1999 The University of Melbourne.
+% This file may only be copied under the terms of the GNU Library General
+% Public License - see the file COPYING.LIB in the Mercury distribution.
+%---------------------------------------------------------------------------%
+
+:- module mdb.
+
+:- interface.
+
+:- pred mdb__version(string::out) is det.
+
+ % These interface modules are used directly by the test programs
+ % or the libmer_trace library.
+:- include_module browse, help.
+:- include_module interactive_query.
+:- include_module debugger_interface, collect_lib.
+:- include_module declarative_debugger, declarative_execution.
+
+:- implementation.
+
+:- include_module frame, parse, util.
+:- include_module declarative_analyser, declarative_oracle, declarative_user.
+
+ % XXX these modules are more generally useful, but the
+ % dynamic linking library is not yet installed anywhere.
+:- include_module dl, name_mangle.
+
+% See library/library.m for why we implement this predicate this way.
+
+:- pragma c_code(mdb__version(Version::out),
+ will_not_call_mercury, "
+ ConstString version_string =
+ MR_VERSION "", configured for "" MR_FULLARCH;
+ /*
+ ** Cast away const needed here, because Mercury declares Version
+ ** with type String rather than ConstString.
+ */
+ Version = (String) (Word) version_string;
+").
+
+%---------------------------------------------------------------------------%
Index: browser/name_mangle.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/name_mangle.m,v
retrieving revision 1.1
diff -u -u -r1.1 name_mangle.m
--- name_mangle.m 1999/03/05 12:52:11 1.1
+++ name_mangle.m 2000/01/06 01:16:11
@@ -20,7 +20,7 @@
% it can be easily changed if the representation of `mercury_proc' changes.
%-----------------------------------------------------------------------------%
-:- module name_mangle.
+:- module mdb__name_mangle.
:- interface.
% Given a mercury_proc specifying the module name,
Index: browser/parse.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/parse.m,v
retrieving revision 1.5
diff -u -u -r1.5 parse.m
--- parse.m 1999/05/30 03:54:33 1.5
+++ parse.m 1999/12/21 02:44:46
@@ -59,7 +59,7 @@
% ".."
%
-:- module parse.
+:- module mdb__parse.
:- interface.
@@ -120,7 +120,7 @@
:- implementation.
:- import_module char, int, std_util.
-:- import_module util.
+:- import_module mdb__util.
:- type token
Index: browser/util.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/browser/util.m,v
retrieving revision 1.6
diff -u -u -r1.6 util.m
--- util.m 1999/12/15 19:10:58 1.6
+++ util.m 2000/01/05 04:19:33
@@ -4,7 +4,7 @@
% Public License - see the file COPYING.LIB in the Mercury distribution.
%---------------------------------------------------------------------------%
-:- module util.
+:- module mdb__util.
:- interface.
Index: trace/mercury_trace_browse.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/trace/mercury_trace_browse.c,v
retrieving revision 1.8
diff -u -u -r1.8 mercury_trace_browse.c
--- mercury_trace_browse.c 1999/09/27 05:20:56 1.8
+++ mercury_trace_browse.c 2000/01/05 05:23:19
@@ -26,8 +26,8 @@
#include "mercury_trace_util.h"
#include "mercury_trace_internal.h"
#include "mercury_deep_copy.h"
-#include "browse.h"
-#include "interactive_query.h"
+#include "mdb.browse.h"
+#include "mdb.interactive_query.h"
#include "std_util.h"
#include "mercury_trace_external.h"
#include <stdio.h>
Index: trace/mercury_trace_declarative.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/trace/mercury_trace_declarative.c,v
retrieving revision 1.14
diff -u -u -r1.14 mercury_trace_declarative.c
--- mercury_trace_declarative.c 2000/01/03 02:23:03 1.14
+++ mercury_trace_declarative.c 2000/01/05 05:23:59
@@ -40,8 +40,8 @@
#include "mercury_layout_util.h"
#include "mercury_deep_copy.h"
#include "mercury_string.h"
-#include "declarative_debugger.h"
-#include "declarative_execution.h"
+#include "mdb.declarative_debugger.h"
+#include "mdb.declarative_execution.h"
#include "std_util.h"
#include <errno.h>
Index: trace/mercury_trace_external.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/trace/mercury_trace_external.c,v
retrieving revision 1.35
diff -u -u -r1.35 mercury_trace_external.c
--- mercury_trace_external.c 2000/01/26 06:17:40 1.35
+++ mercury_trace_external.c 2000/02/01 05:32:30
@@ -29,8 +29,8 @@
#include "mercury_trace_browse.h"
#include "mercury_trace_vars.h"
-#include "debugger_interface.h"
-#include "collect_lib.h"
+#include "mdb.debugger_interface.h"
+#include "mdb.collect_lib.h"
#include "mercury_deep_copy.h"
#include "std_util.h"
Index: trace/mercury_trace_help.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/trace/mercury_trace_help.c,v
retrieving revision 1.6
diff -u -u -r1.6 mercury_trace_help.c
--- mercury_trace_help.c 1999/09/27 05:20:58 1.6
+++ mercury_trace_help.c 2000/01/05 06:37:46
@@ -29,7 +29,7 @@
#include "mercury_deep_copy.h"
#include "mercury_trace_util.h"
#include "std_util.h"
-#include "help.h"
+#include "mdb.help.h"
#include "io.h"
#include <stdio.h>
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.62
diff -u -u -r1.62 mercury_trace_internal.c
--- mercury_trace_internal.c 2000/01/03 08:53:15 1.62
+++ mercury_trace_internal.c 2000/01/05 06:38:00
@@ -26,7 +26,7 @@
#include "mercury_array_macros.h"
#include "mercury_getopt.h"
-#include "browse.h"
+#include "mdb.browse.h"
#include <stdio.h>
#include <stdlib.h>
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/Mmakefile,v
retrieving revision 1.75
diff -u -u -r1.75 Mmakefile
--- Mmakefile 2000/01/20 07:39:30 1.75
+++ Mmakefile 2000/02/01 05:31:12
@@ -130,6 +130,7 @@
MCFLAGS-type_spec = --user-guided-type-specialization
MCFLAGS-existential_types_test = --infer-all
MCFLAGS-user_defined_equality = --infer-all
+MCFLAGS-parse = --trace deep
# In grade `none' with options `-O1 --opt-space' on kryten
# (a sparc-sun-solaris2.5 system), mode_choice needs to be linked
@@ -147,6 +148,9 @@
GRADEFLAGS-integer_test_init = --gc conservative
GRADEFLAGS-rational_test = --gc conservative
GRADEFLAGS-rational_test_init = --gc conservative
+
+C2INITFLAGS-parse = --trace
+MLFLAGS-parse = --trace --static
# no_fully_strict is expected to fail (it calls error/1)
# so we need to ignore the exit status (hence the leading `-')
Index: tests/hard_coded/parse.exp
===================================================================
RCS file: parse.exp
diff -N parse.exp
--- /dev/null Fri Feb 4 12:46:23 2000
+++ parse.exp Mon Jan 10 10:55:10 2000
@@ -0,0 +1 @@
+ok
Index: tests/hard_coded/parse.m
===================================================================
RCS file: parse.m
diff -N parse.m
--- /dev/null Fri Feb 4 12:46:23 2000
+++ parse.m Mon Jan 10 11:15:15 2000
@@ -0,0 +1,15 @@
+% Mercury 0.9 had a bug where a program compiled with tracing
+% could not have a module with the same name as one of the
+% browser library modules, which are not user-visible.
+:- module parse.
+
+:- interface.
+
+:- import_module io.
+
+:- pred main(io__state::di, io__state::uo) is det.
+
+:- implementation.
+
+main -->
+ io__write_string("ok\n").
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------
More information about the developers
mailing list