diff: enable --warn-interface-imports
Tyson Richard DOWD
trd at cs.mu.oz.au
Wed May 21 11:57:43 AEST 1997
Hi,
Can someone review this one?
===================================================================
Estimated hours taken: 3
Enable --warn-interface-imports by default. This was turned off while
list and term were defined in mercury_builtin.m, since it caused many
warnings.
Fix all the unused interface imports that have been added since then.
compiler/options.m:
Enable --warn-interface-imports by default.
compiler/module_qual.m:
Fix formatting inconsistencies with module names in warning
messages. (".m" was not appended to module names if there was
only one module).
compiler/*.m:
library/*.m:
tests/invalid/type_loop.m:
tests/warnings/*.m:
Remove usused interface imports, or move them into
implementation (mostly bool, list and std_util).
Index: compiler/bytecode.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/bytecode.m,v
retrieving revision 1.25
diff -u -r1.25 bytecode.m
--- bytecode.m 1997/04/26 16:39:17 1.25
+++ bytecode.m 1997/05/20 06:15:31
@@ -14,7 +14,7 @@
:- interface.
-:- import_module hlds_data, llds, llds_out, tree.
+:- import_module hlds_data, llds, tree.
:- import_module list, std_util, io.
:- type byte_tree == tree(list(byte_code)).
@@ -120,7 +120,7 @@
:- implementation.
-:- import_module hlds_pred.
+:- import_module hlds_pred, llds_out.
:- import_module char, library, int, string, require.
:- pred bytecode__version(int::out) is det.
Index: compiler/call_gen.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/call_gen.m,v
retrieving revision 1.108
diff -u -r1.108 call_gen.m
--- call_gen.m 1997/05/12 08:19:39 1.108
+++ call_gen.m 1997/05/20 05:32:11
@@ -18,7 +18,7 @@
:- interface.
-:- import_module hlds_pred, hlds_goal, llds, code_info.
+:- import_module hlds_pred, llds, code_info.
:- pred call_gen__generate_higher_order_call(code_model, var, list(var),
list(type), list(mode), determinism,
Index: compiler/code_aux.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/code_aux.m,v
retrieving revision 1.46
diff -u -r1.46 code_aux.m
--- code_aux.m 1997/05/05 11:16:38 1.46
+++ code_aux.m 1997/05/20 06:26:47
@@ -15,8 +15,8 @@
:- interface.
-:- import_module code_info, hlds_goal, hlds_data, llds.
-:- import_module list, map, varset.
+:- import_module code_info, hlds_goal.
+:- import_module varset.
% code_aux__contains_only_builtins(G) is true if G is a leaf procedure,
% i.e. control does not leave G to call another procedure, even if
@@ -54,6 +54,7 @@
:- import_module hlds_module, llds_out, type_util.
:- import_module bool, string, set, term, std_util, assoc_list, require.
+:- import_module list, map.
code_aux__contains_only_builtins(Goal - _GoalInfo) :-
code_aux__contains_only_builtins_2(Goal).
Index: compiler/code_exprn.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/code_exprn.m,v
retrieving revision 1.48
diff -u -r1.48 code_exprn.m
--- code_exprn.m 1997/05/12 07:02:48 1.48
+++ code_exprn.m 1997/05/20 06:28:25
@@ -31,7 +31,7 @@
:- interface.
-:- import_module llds, list, varset, std_util, assoc_list, tree, options.
+:- import_module llds, list, varset, assoc_list, options.
:- type exprn_info.
@@ -238,8 +238,8 @@
:- implementation.
-:- import_module exprn_aux.
-:- import_module bool, map, bag, set, require, int, term, string.
+:- import_module exprn_aux, tree.
+:- import_module bool, map, bag, set, require, int, term, string, std_util.
:- type var_stat ---> evaled(set(rval))
; cached(rval).
Index: compiler/code_gen.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/code_gen.m,v
retrieving revision 1.24
diff -u -r1.24 code_gen.m
--- code_gen.m 1997/05/05 11:16:40 1.24
+++ code_gen.m 1997/05/20 06:29:07
@@ -29,7 +29,7 @@
:- interface.
-:- import_module hlds_module, hlds_pred, hlds_goal, llds, code_info, shapes.
+:- import_module hlds_module, hlds_pred, hlds_goal, llds, code_info.
:- import_module list, assoc_list, io.
% Translate a HLDS structure into an LLDS
@@ -62,7 +62,7 @@
:- import_module disj_gen, pragma_c_gen, globals, options, hlds_out.
:- import_module code_aux, middle_rec, passes_aux.
:- import_module code_util, type_util, mode_util.
-:- import_module prog_data, instmap.
+:- import_module prog_data, instmap, shapes.
:- import_module bool, char, int, string, list, term.
:- import_module map, tree, std_util, require, set, varset.
Index: compiler/code_info.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/code_info.m,v
retrieving revision 1.200
diff -u -r1.200 code_info.m
--- code_info.m 1997/05/12 07:02:54 1.200
+++ code_info.m 1997/05/20 06:29:55
@@ -34,12 +34,12 @@
:- interface.
:- import_module hlds_pred, hlds_goal, llds, instmap.
-:- import_module code_util, tree, globals, unify_proc.
+:- import_module globals.
:- import_module bool, set, std_util, assoc_list.
:- implementation.
-:- import_module hlds_module, hlds_data.
+:- import_module hlds_module, hlds_data, code_util.
:- import_module code_exprn, set, varset, term, stack, prog_data.
:- import_module type_util, mode_util, options, shapes.
:- import_module string, require, char, list, map, bimap, tree, int.
Index: compiler/common.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/common.m,v
retrieving revision 1.39
diff -u -r1.39 common.m
--- common.m 1997/04/28 00:01:59 1.39
+++ common.m 1997/05/20 06:30:26
@@ -29,7 +29,7 @@
:- module common.
:- interface.
-:- import_module hlds_module, hlds_pred, simplify.
+:- import_module hlds_pred, simplify.
% If we find a deconstruction or a construction we cannot optimize,
% record the details of the memory cell in CommonInfo.
@@ -80,7 +80,7 @@
:- import_module hlds_goal, hlds_data, quantification, mode_util, type_util.
:- import_module det_util, det_report, globals, options, inst_match, instmap.
-:- import_module prog_data.
+:- import_module prog_data, hlds_module.
:- import_module bool, term, map, set, list, eqvclass, require, std_util.
:- type structure ---> structure(var, type, cons_id, list(var)).
Index: compiler/constraint.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/constraint.m,v
retrieving revision 1.32
diff -u -r1.32 constraint.m
--- constraint.m 1997/05/05 11:16:43 1.32
+++ constraint.m 1997/05/20 05:34:11
@@ -23,7 +23,7 @@
:- interface.
-:- import_module hlds_module, llds.
+:- import_module hlds_module.
:- import_module io.
:- pred constraint_propagation(module_info, module_info, io__state, io__state).
Index: compiler/dense_switch.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/dense_switch.m,v
retrieving revision 1.23
diff -u -r1.23 dense_switch.m
--- dense_switch.m 1997/02/19 05:30:00 1.23
+++ dense_switch.m 1997/05/20 06:30:55
@@ -17,7 +17,6 @@
:- interface.
:- import_module llds, switch_gen, code_info, type_util.
-:- import_module list.
% Should this switch be implemented as a dense jump table?
% If so, we return the starting and ending values for the table,
@@ -50,7 +49,7 @@
:- implementation.
:- import_module hlds_module, hlds_goal, hlds_data, code_gen.
-:- import_module char, map, tree, int, std_util, require.
+:- import_module char, map, tree, int, std_util, require, list.
dense_switch__is_dense_switch(CaseVar, TaggedCases, CanFail0, ReqDensity,
FirstVal, LastVal, CanFail) -->
Index: compiler/fact_table.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/fact_table.m,v
retrieving revision 1.6
diff -u -r1.6 fact_table.m
--- fact_table.m 1997/05/20 01:51:44 1.6
+++ fact_table.m 1997/05/20 06:31:42
@@ -49,7 +49,7 @@
:- interface.
-:- import_module io, string, list.
+:- import_module io, list.
:- import_module prog_data, hlds_pred, hlds_module.
% compile the fact table into a separate .o file.
@@ -87,7 +87,7 @@
:- implementation.
:- import_module int, map, std_util, assoc_list, char, require, library, bool.
-:- import_module float, math, getopt, term.
+:- import_module float, math, getopt, term, string.
:- import_module parser, prog_out, term_io, llds_out, hlds_out, hlds_data.
:- import_module globals, options, passes_aux, arg_info, llds, mode_util.
:- import_module code_util, export.
Index: compiler/follow_code.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/follow_code.m,v
retrieving revision 1.39
diff -u -r1.39 follow_code.m
--- follow_code.m 1997/05/05 11:16:53 1.39
+++ follow_code.m 1997/05/20 05:34:43
@@ -13,7 +13,7 @@
:- interface.
-:- import_module hlds_module, hlds_pred, llds.
+:- import_module hlds_module, hlds_pred.
:- pred move_follow_code_in_proc(proc_info, proc_info,
module_info, module_info).
Index: compiler/frameopt.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/frameopt.m,v
retrieving revision 1.56
diff -u -r1.56 frameopt.m
--- frameopt.m 1997/04/07 05:39:21 1.56
+++ frameopt.m 1997/05/20 05:34:59
@@ -75,7 +75,7 @@
:- interface.
:- import_module llds.
-:- import_module bool, list, map, bimap.
+:- import_module bool, list.
% Delay the construction of det stack frames as long as possible,
% in order to avoid the construction in as many cases as possible.
Index: compiler/hlds_goal.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/hlds_goal.m,v
retrieving revision 1.32
diff -u -r1.32 hlds_goal.m
--- hlds_goal.m 1997/05/20 01:51:51 1.32
+++ hlds_goal.m 1997/05/20 05:35:09
@@ -13,7 +13,7 @@
:- interface.
:- import_module hlds_data, prog_data, instmap.
-:- import_module bool, list, assoc_list, set, map, std_util.
+:- import_module list, assoc_list, set, map, std_util.
% Here is how goals are represented
Index: compiler/inlining.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/inlining.m,v
retrieving revision 1.61
diff -u -r1.61 inlining.m
--- inlining.m 1997/05/05 11:17:06 1.61
+++ inlining.m 1997/05/20 06:32:16
@@ -78,7 +78,7 @@
%-----------------------------------------------------------------------------%
:- interface.
-:- import_module hlds_module, llds.
+:- import_module hlds_module.
:- import_module io.
:- pred inlining(module_info, module_info, io__state, io__state).
@@ -92,7 +92,7 @@
:- implementation.
-:- import_module hlds_pred, hlds_goal, globals, options.
+:- import_module hlds_pred, hlds_goal, globals, options, llds.
:- import_module dead_proc_elim, type_util, mode_util, goal_util.
:- import_module passes_aux, code_aux, quantification.
Index: compiler/livemap.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/livemap.m,v
retrieving revision 1.23
diff -u -r1.23 livemap.m
--- livemap.m 1997/04/17 07:47:23 1.23
+++ livemap.m 1997/05/20 06:24:46
@@ -16,7 +16,7 @@
:- interface.
-:- import_module bool, list, set, map.
+:- import_module list, set, map.
:- import_module llds.
:- type livemap == map(label, lvalset).
@@ -33,7 +33,7 @@
:- implementation.
:- import_module opt_util.
-:- import_module std_util, require, string.
+:- import_module std_util, require, string, bool.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
Index: compiler/liveness.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/liveness.m,v
retrieving revision 1.73
diff -u -r1.73 liveness.m
--- liveness.m 1997/05/16 05:45:25 1.73
+++ liveness.m 1997/05/20 05:35:39
@@ -57,7 +57,6 @@
:- interface.
:- import_module hlds_module, hlds_pred.
-:- import_module io.
% Add liveness annotations to the goal of the procedure.
% This consists of the {pre,post}{birth,death} sets and
Index: compiler/llds_common.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/llds_common.m,v
retrieving revision 1.6
diff -u -r1.6 llds_common.m
--- llds_common.m 1997/01/21 05:05:08 1.6
+++ llds_common.m 1997/05/20 05:35:55
@@ -20,7 +20,7 @@
:- interface.
-:- import_module llds, string.
+:- import_module llds.
:- pred llds_common(list(c_procedure), list(c_module), string,
list(c_procedure), list(c_module), list(c_module)).
Index: compiler/llds_out.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/llds_out.m,v
retrieving revision 1.45
diff -u -r1.45 llds_out.m
--- llds_out.m 1997/05/06 16:28:09 1.45
+++ llds_out.m 1997/05/20 06:33:55
@@ -18,7 +18,7 @@
:- interface.
:- import_module llds.
-:- import_module io, list, term.
+:- import_module io.
% Given a 'c_file' structure, open the appropriate .mod file
% and output the code into that file.
@@ -82,7 +82,7 @@
:- import_module shapes, export.
:- import_module exprn_aux, prog_data, prog_out, hlds_pred.
-:- import_module bool, int, char, string, set, std_util.
+:- import_module bool, int, list, char, string, set, std_util, term.
:- import_module require, globals, options.
:- import_module library. % for the version number.
Index: compiler/mercury_compile.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/mercury_compile.m,v
retrieving revision 1.36
diff -u -r1.36 mercury_compile.m
--- mercury_compile.m 1997/05/20 01:51:55 1.36
+++ mercury_compile.m 1997/05/21 01:45:09
@@ -15,7 +15,7 @@
:- module mercury_compile.
:- interface.
-:- import_module bool, string, io.
+:- import_module io.
:- pred main(io__state::di, io__state::uo) is det.
@@ -25,7 +25,7 @@
:- implementation.
% library modules
-:- import_module int, list, map, set, std_util, dir, require.
+:- import_module int, list, map, set, std_util, dir, require, string, bool.
:- import_module library, getopt, term, varset.
% the main compiler passes (in order of execution)
Index: compiler/mercury_to_c.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/mercury_to_c.m,v
retrieving revision 1.24
diff -u -r1.24 mercury_to_c.m
--- mercury_to_c.m 1997/05/05 11:17:17 1.24
+++ mercury_to_c.m 1997/05/20 06:35:18
@@ -38,7 +38,7 @@
:- interface.
:- import_module hlds_module.
-:- import_module int, io.
+:- import_module io.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
@@ -58,7 +58,7 @@
:- import_module prog_util, mode_util, hlds_out, stack, quantification.
:- import_module globals, options.
:- import_module string, map, list, require, std_util, term, term_io, getopt.
-:- import_module bool, set, varset.
+:- import_module bool, set, varset, int.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
Index: compiler/mercury_to_goedel.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/mercury_to_goedel.m,v
retrieving revision 1.56
diff -u -r1.56 mercury_to_goedel.m
--- mercury_to_goedel.m 1996/11/04 06:26:06 1.56
+++ mercury_to_goedel.m 1997/05/20 06:36:09
@@ -30,7 +30,7 @@
:- module mercury_to_goedel.
:- interface.
-:- import_module string, list, io.
+:- import_module list, io.
:- import_module prog_data.
:- pred convert_to_goedel(string, list(item_and_context), io__state, io__state).
@@ -39,7 +39,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module bool, int, char, std_util, varset, term, require.
+:- import_module bool, int, char, std_util, varset, term, require, string.
:- import_module prog_io, prog_out, prog_util, equiv_type.
:- import_module globals, options.
%-----------------------------------------------------------------------------%
Index: compiler/mode_debug.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/mode_debug.m,v
retrieving revision 1.5
diff -u -r1.5 mode_debug.m
--- mode_debug.m 1997/05/20 01:51:57 1.5
+++ mode_debug.m 1997/05/20 05:37:29
@@ -16,7 +16,7 @@
:- interface.
-:- import_module hlds_module, hlds_pred, mode_info.
+:- import_module mode_info.
% Print a debugging message which includes the port, message string,
% and the current instmap (but only if `--debug-modes' was enabled).
Index: compiler/modecheck_call.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/modecheck_call.m,v
retrieving revision 1.9
diff -u -r1.9 modecheck_call.m
--- modecheck_call.m 1997/04/08 02:26:27 1.9
+++ modecheck_call.m 1997/05/20 05:37:35
@@ -21,7 +21,7 @@
:- module modecheck_call.
:- interface.
-:- import_module hlds_goal, mode_info, modes.
+:- import_module hlds_goal, mode_info.
:- pred modecheck_call_pred(pred_id, list(var), proc_id, list(var),
pair(list(hlds_goal)), mode_info, mode_info).
Index: compiler/modes.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/modes.m,v
retrieving revision 1.199
diff -u -r1.199 modes.m
--- modes.m 1997/05/05 11:17:21 1.199
+++ modes.m 1997/05/20 06:37:54
@@ -164,7 +164,7 @@
% The following predicates are used by unique_modes.m.
-:- import_module mode_info, mode_errors, clause_to_proc.
+:- import_module mode_info.
% Modecheck a unification.
@@ -260,7 +260,7 @@
:- import_module mode_info, delay_info, mode_errors, inst_match, instmap.
:- import_module type_util, mode_util, code_util, prog_data, unify_proc.
:- import_module globals, options, mercury_to_mercury, hlds_out, int, set.
-:- import_module passes_aux, typecheck, module_qual.
+:- import_module passes_aux, typecheck, module_qual, clause_to_proc.
:- import_module modecheck_unify, modecheck_call.
:- import_module list, map, varset, term, prog_out, string, require, std_util.
:- import_module assoc_list.
Index: compiler/module_qual.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/module_qual.m,v
retrieving revision 1.13
diff -u -r1.13 module_qual.m
--- module_qual.m 1997/02/02 12:41:50 1.13
+++ module_qual.m 1997/05/20 05:47:29
@@ -824,7 +824,7 @@
write_module_list([Import1, Import2]) -->
io__write_strings([Import1, ".m and ", Import2 ,".m"]).
write_module_list([Import]) -->
- io__write_string(Import).
+ io__write_strings([Import, ".m"]).
write_module_list([]) -->
{ error("module_qual:write_module_list") }.
Index: compiler/optimize.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/optimize.m,v
retrieving revision 1.6
diff -u -r1.6 optimize.m
--- optimize.m 1997/05/07 11:39:31 1.6
+++ optimize.m 1997/05/20 06:41:11
@@ -14,7 +14,7 @@
:- interface.
-:- import_module llds, io, options.
+:- import_module llds, io.
:- pred optimize__main(list(c_procedure), list(c_procedure),
io__state, io__state).
@@ -30,7 +30,7 @@
:- import_module bool, list, map, bimap, int, std_util.
:- import_module jumpopt, labelopt, dupelim, peephole.
-:- import_module frameopt, delay_slot, value_number.
+:- import_module frameopt, delay_slot, value_number, options.
:- import_module globals, passes_aux, opt_util, opt_debug, vn_debug.
optimize__main([], []) --> [].
Index: compiler/options.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/options.m,v
retrieving revision 1.196
diff -u -r1.196 options.m
--- options.m 1997/05/20 01:51:59 1.196
+++ options.m 1997/05/20 06:56:49
@@ -18,7 +18,7 @@
:- module options.
:- interface.
-:- import_module list, io, getopt.
+:- import_module io, getopt.
:- pred short_option(character::in, option::out) is semidet.
:- pred long_option(string::in, option::out) is semidet.
@@ -219,7 +219,7 @@
:- implementation.
-:- import_module bool, int, map, std_util, assoc_list, require.
+:- import_module bool, int, map, std_util, assoc_list, require, list.
:- type option_category
---> warning_option
@@ -255,7 +255,7 @@
warn_det_decls_too_lax - bool(yes),
warn_nothing_exported - bool(yes),
warn_unused_args - bool(no),
- warn_interface_imports - bool(no),
+ warn_interface_imports - bool(yes),
warn_non_stratification - bool(no),
warn_missing_opt_files - bool(yes),
warn_simple_code - bool(yes),
Index: compiler/prog_io.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/prog_io.m,v
retrieving revision 1.154
diff -u -r1.154 prog_io.m
--- prog_io.m 1997/02/23 06:07:43 1.154
+++ prog_io.m 1997/05/21 01:35:43
@@ -55,8 +55,8 @@
:- interface.
-:- import_module prog_data, prog_io_util.
-:- import_module list, varset, term, io.
+:- import_module prog_data.
+:- import_module list, io.
%-----------------------------------------------------------------------------%
@@ -98,9 +98,10 @@
:- implementation.
-:- import_module prog_io_goal, prog_io_dcg, prog_io_pragma.
+:- import_module prog_io_goal, prog_io_dcg, prog_io_pragma, prog_io_util.
:- import_module hlds_data, hlds_pred, prog_util, globals, options.
:- import_module bool, int, string, std_util, parser, term_io, dir, require.
+:- import_module term.
%-----------------------------------------------------------------------------%
Index: compiler/prog_io_dcg.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/prog_io_dcg.m,v
retrieving revision 1.3
diff -u -r1.3 prog_io_dcg.m
--- prog_io_dcg.m 1997/02/23 06:07:48 1.3
+++ prog_io_dcg.m 1997/05/20 07:02:47
@@ -14,8 +14,8 @@
:- interface.
-:- import_module prog_data, prog_io_util.
-:- import_module list, varset, term, io.
+:- import_module prog_io_util.
+:- import_module varset, term.
:- pred parse_dcg_clause(string, varset, term, term, term__context,
maybe_item_and_context).
@@ -23,8 +23,8 @@
:- implementation.
-:- import_module prog_io_goal, prog_util.
-:- import_module int, string, std_util, varset.
+:- import_module prog_io_goal, prog_util, prog_data.
+:- import_module int, string, std_util, varset, list.
%-----------------------------------------------------------------------------%
Index: compiler/prog_io_goal.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/prog_io_goal.m,v
retrieving revision 1.3
diff -u -r1.3 prog_io_goal.m
--- prog_io_goal.m 1997/02/23 06:07:51 1.3
+++ prog_io_goal.m 1997/05/20 05:39:35
@@ -13,7 +13,7 @@
:- interface.
-:- import_module prog_data, prog_io_util, hlds_pred.
+:- import_module prog_data, prog_io_util.
:- import_module list, term, varset.
% Convert a single term into a goal.
Index: compiler/shapes.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/shapes.m,v
retrieving revision 1.41
diff -u -r1.41 shapes.m
--- shapes.m 1997/04/07 05:39:43 1.41
+++ shapes.m 1997/05/20 07:03:23
@@ -43,7 +43,7 @@
:- interface.
:- import_module hlds_module.
-:- import_module list, term, io.
+:- import_module list, io.
:- type tagged_num == pair(shape_num, tag_type).
:- type tag_type ---> const; simple; complicated.
@@ -89,7 +89,7 @@
:- implementation.
:- import_module code_util, hlds_pred, hlds_data, llds, prog_data, type_util.
-:- import_module int, assoc_list, map, std_util, require.
+:- import_module int, assoc_list, map, std_util, require, term.
:- type bit_number ---> bit_zero; bit_one; bit_two; bit_three.
Index: compiler/simplify.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/simplify.m,v
retrieving revision 1.32
diff -u -r1.32 simplify.m
--- simplify.m 1997/05/08 06:46:54 1.32
+++ simplify.m 1997/05/20 07:03:54
@@ -28,7 +28,7 @@
:- interface.
:- import_module common, hlds_pred, det_report, det_util.
-:- import_module list, io.
+:- import_module io.
:- pred simplify__proc(simplify, pred_id, proc_id, module_info, module_info,
proc_info, proc_info, int, int, io__state, io__state).
@@ -65,7 +65,7 @@
:- import_module hlds_module, hlds_goal, hlds_data, instmap, inst_match.
:- import_module globals, options, passes_aux, prog_data, mode_util, type_util.
:- import_module code_util, quantification, modes.
-:- import_module bool, set, map, require, std_util, term, varset.
+:- import_module bool, list, set, map, require, std_util, term, varset.
%-----------------------------------------------------------------------------%
Index: compiler/tag_switch.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/tag_switch.m,v
retrieving revision 1.35
diff -u -r1.35 tag_switch.m
--- tag_switch.m 1997/04/17 07:49:01 1.35
+++ tag_switch.m 1997/05/20 05:40:00
@@ -15,7 +15,7 @@
:- interface.
:- import_module hlds_goal, llds, switch_gen, code_info.
-:- import_module list, assoc_list.
+:- import_module list.
% Generate intelligent indexing code for tag based switches.
Index: compiler/transform.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/transform.m,v
retrieving revision 1.9
diff -u -r1.9 transform.m
--- transform.m 1997/02/23 06:08:18 1.9
+++ transform.m 1997/05/20 05:40:08
@@ -30,7 +30,7 @@
:- module transform.
:- interface.
-:- import_module hlds_goal, llds, mode_info.
+:- import_module hlds_goal, mode_info.
%:- pred unfold__in_proc(pred_id, proc_id, hlds_goal_expr,
% mode_info, mode_info).
Index: compiler/unify_gen.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/unify_gen.m,v
retrieving revision 1.78
diff -u -r1.78 unify_gen.m
--- unify_gen.m 1997/02/23 01:13:14 1.78
+++ unify_gen.m 1997/05/20 07:04:20
@@ -19,7 +19,7 @@
:- interface.
-:- import_module hlds_goal, hlds_data, llds, code_info, code_util.
+:- import_module hlds_goal, hlds_data, llds, code_info.
:- import_module list.
:- type test_sense --->
@@ -62,7 +62,7 @@
:- implementation.
-:- import_module hlds_module, hlds_pred, prog_data.
+:- import_module hlds_module, hlds_pred, prog_data, code_util.
:- import_module mode_util, code_aux, hlds_out, tree.
:- import_module bool, string, int, map, term, require, std_util.
Index: compiler/unify_proc.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/unify_proc.m,v
retrieving revision 1.57
diff -u -r1.57 unify_proc.m
--- unify_proc.m 1997/05/20 01:52:10 1.57
+++ unify_proc.m 1997/05/20 07:05:55
@@ -44,8 +44,8 @@
:- interface.
:- import_module hlds_module, hlds_pred, hlds_goal, hlds_data.
-:- import_module llds, modes, prog_data, special_pred.
-:- import_module bool, std_util, io, list.
+:- import_module modes, prog_data, special_pred.
+:- import_module std_util, io.
:- type unify_requests.
@@ -89,7 +89,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module tree, map, queue, int, string, require.
+:- import_module list, tree, map, queue, int, string, require, bool.
:- import_module code_util, code_info, type_util, varset.
:- import_module mercury_to_mercury, hlds_out.
:- import_module make_hlds, term, prog_util.
Index: compiler/value_number.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/value_number.m,v
retrieving revision 1.81
diff -u -r1.81 value_number.m
--- value_number.m 1997/04/18 10:46:30 1.81
+++ value_number.m 1997/05/20 07:06:20
@@ -14,7 +14,7 @@
:- interface.
-:- import_module bool, list, io.
+:- import_module list, io.
:- import_module llds.
% Find straight-line code sequences and optimize them using
@@ -40,6 +40,7 @@
:- implementation.
:- import_module set, map, bimap, require, int, string, std_util, assoc_list.
+:- import_module bool.
:- import_module vn_type, vn_table, vn_block, vn_order, vn_flush, vn_temploc.
:- import_module vn_cost, vn_debug, vn_util, vn_verify, vn_filter.
Index: compiler/vn_cost.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/vn_cost.m,v
retrieving revision 1.24
diff -u -r1.24 vn_cost.m
--- vn_cost.m 1997/04/28 04:31:49 1.24
+++ vn_cost.m 1997/05/20 07:07:08
@@ -15,7 +15,7 @@
:- interface.
:- import_module vn_type, llds.
-:- import_module bool, list, int, io.
+:- import_module bool, list, io.
:- pred vn_cost__block_cost(list(instruction), vn_params, bool, int,
io__state, io__state).
@@ -30,7 +30,7 @@
:- implementation.
:- import_module vn_debug.
-:- import_module require, string, std_util.
+:- import_module require, string, std_util, int.
vn_cost__block_cost(Instr, Params, PrintInstr, Cost) -->
vn_cost__block_cost_2(Instr, Params, PrintInstr, 0, Cost).
Index: compiler/vn_debug.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/vn_debug.m,v
retrieving revision 1.24
diff -u -r1.24 vn_debug.m
--- vn_debug.m 1996/11/06 13:01:13 1.24
+++ vn_debug.m 1997/05/20 07:07:36
@@ -15,7 +15,7 @@
:- interface.
:- import_module atsort, vn_type, vn_table, livemap.
-:- import_module bool, map, list, io.
+:- import_module bool, list, io.
:- pred vn_debug__tuple_msg(maybe(bool), list(instruction), vn_ctrl_tuple,
io__state, io__state).
@@ -96,7 +96,7 @@
:- implementation.
:- import_module llds, llds_out, globals, options, opt_debug.
-:- import_module string, int, std_util.
+:- import_module string, int, std_util, map.
vn_debug__tuple_msg(Intermediate, Instrs, Tuple) -->
vn_debug__tuple_msg_flag(Flag),
Index: compiler/vn_temploc.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/vn_temploc.m,v
retrieving revision 1.13
diff -u -r1.13 vn_temploc.m
--- vn_temploc.m 1996/12/31 09:58:56 1.13
+++ vn_temploc.m 1997/05/20 07:08:06
@@ -15,7 +15,7 @@
:- interface.
:- import_module vn_type, vn_table.
-:- import_module list, set, int.
+:- import_module list.
:- type templocs.
@@ -58,7 +58,7 @@
:- implementation.
-:- import_module llds, require.
+:- import_module llds, require, int, set.
:- type templocs ---> templocs(
vnlvalset, % live values; don't use
Index: library/array.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/array.m,v
retrieving revision 1.30
diff -u -r1.30 array.m
--- array.m 1997/05/06 07:47:28 1.30
+++ array.m 1997/05/20 05:54:57
@@ -23,7 +23,7 @@
:- module array.
:- interface.
-:- import_module int, list.
+:- import_module list.
:- type array(T).
@@ -90,7 +90,7 @@
:- implementation.
-:- import_module require, map.
+:- import_module int, require, map.
:- type array(T) ---> array(int, int, map(int,T)).
Index: library/bimap.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/bimap.m,v
retrieving revision 1.8
diff -u -r1.8 bimap.m
--- bimap.m 1995/10/27 09:40:09 1.8
+++ bimap.m 1997/05/20 05:43:25
@@ -20,7 +20,7 @@
:- module bimap.
:- interface.
-:- import_module list, int, std_util, assoc_list.
+:- import_module list, assoc_list.
%-----------------------------------------------------------------------------%
Index: library/bintree.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/bintree.m,v
retrieving revision 1.34
diff -u -r1.34 bintree.m
--- bintree.m 1995/10/27 09:40:10 1.34
+++ bintree.m 1997/05/20 05:55:52
@@ -29,7 +29,7 @@
:- module bintree.
:- interface.
-:- import_module list, std_util, assoc_list.
+:- import_module list, assoc_list.
:- type bintree(K, V).
@@ -92,7 +92,7 @@
:- implementation.
-:- import_module require, int.
+:- import_module require, int, std_util.
:- type bintree(K,V) ---> empty
; tree(
Index: library/char.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/char.m,v
retrieving revision 1.19
diff -u -r1.19 char.m
--- char.m 1997/02/19 05:32:55 1.19
+++ char.m 1997/05/20 05:44:01
@@ -24,8 +24,6 @@
:- module char.
:- interface.
-:- import_module list.
-
%-----------------------------------------------------------------------------%
:- type char == character.
Index: library/dir.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/dir.m,v
retrieving revision 1.6
diff -u -r1.6 dir.m
--- dir.m 1995/10/05 11:31:22 1.6
+++ dir.m 1997/05/20 05:56:30
@@ -14,7 +14,6 @@
:- module dir.
:- interface.
-:- import_module string.
% predicates to isolate system dependencies
@@ -38,7 +37,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module int, require.
+:- import_module int, require, string.
dir__directory_separator('/').
Index: library/eqvclass.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/eqvclass.m,v
retrieving revision 1.4
diff -u -r1.4 eqvclass.m
--- eqvclass.m 1996/02/23 00:11:42 1.4
+++ eqvclass.m 1997/05/20 05:45:04
@@ -16,7 +16,7 @@
:- interface.
-:- import_module set, list, std_util.
+:- import_module set, list.
:- type eqvclass(T).
Index: library/getopt.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/getopt.m,v
retrieving revision 1.11
diff -u -r1.11 getopt.m
--- getopt.m 1997/04/22 04:17:29 1.11
+++ getopt.m 1997/05/20 05:57:54
@@ -38,7 +38,7 @@
:- module getopt.
:- interface.
-:- import_module int, string, bool, list, map, std_util.
+:- import_module bool, list, map, std_util.
% getopt__process_options(OptionOps, Args, NonOptionArgs, Result)
%
@@ -150,7 +150,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module require.
+:- import_module require, string.
getopt__process_options(OptionOps, Args0, Args, Result) :-
getopt__get_option_defaults(OptionOps, OptionDefaultsPred),
Index: library/group.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/group.m,v
retrieving revision 1.13
diff -u -r1.13 group.m
--- group.m 1995/10/27 09:40:11 1.13
+++ group.m 1997/05/20 05:58:15
@@ -23,7 +23,7 @@
:- interface.
-:- import_module set, list, std_util, assoc_list.
+:- import_module set, list, assoc_list.
:- type group(T).
@@ -84,7 +84,7 @@
:- implementation.
-:- import_module map, int, require.
+:- import_module map, int, require, std_util.
:- type group(T) --->
group(
Index: library/int.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/int.m,v
retrieving revision 1.42
diff -u -r1.42 int.m
--- int.m 1997/03/23 07:27:06 1.42
+++ int.m 1997/05/20 05:48:24
@@ -15,8 +15,6 @@
:- interface.
-:- import_module float.
-
% less than
:- pred int < int.
:- mode in < in is semidet.
Index: library/io.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/io.m,v
retrieving revision 1.120
diff -u -r1.120 io.m
--- io.m 1997/05/01 10:16:30 1.120
+++ io.m 1997/05/20 05:58:54
@@ -21,7 +21,7 @@
:- module io.
:- interface.
-:- import_module char, int, float, string, std_util, list.
+:- import_module char, string, std_util, list.
%-----------------------------------------------------------------------------%
@@ -869,6 +869,7 @@
:- implementation.
:- import_module map, dir, term, term_io, varset, require, time, uniq_array.
+:- import_module int, std_util.
:- type io__state
---> io__state(
Index: library/lexer.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/lexer.m,v
retrieving revision 1.22
diff -u -r1.22 lexer.m
--- lexer.m 1997/04/30 10:37:49 1.22
+++ lexer.m 1997/05/20 05:59:54
@@ -17,7 +17,7 @@
:- module lexer.
:- interface.
-:- import_module char, string, int, float, list, std_util, io.
+:- import_module list, std_util, io.
:- type token
---> name(string)
@@ -70,7 +70,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module require.
+:- import_module require, char, string, int.
lexer__token_to_string(name(Name), String) :-
string__append_list(["token '", Name, "'"], String).
Index: library/list.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/list.m,v
retrieving revision 1.67
diff -u -r1.67 list.m
--- list.m 1997/05/20 01:52:46 1.67
+++ list.m 1997/05/20 05:49:16
@@ -326,7 +326,6 @@
% by conway.
%
%-----------------------------------------------------------------------------%
-:- import_module std_util.
% list__map(T, L, M) uses the closure T
% to transform the elements of L into the elements of L.
Index: library/map.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/map.m,v
retrieving revision 1.57
diff -u -r1.57 map.m
--- map.m 1997/05/17 03:27:08 1.57
+++ map.m 1997/05/20 06:00:23
@@ -177,7 +177,7 @@
%-----------------------------------------------------------------------------%
-:- import_module tree234, string.
+:- import_module tree234.
:- type map(K,V) == tree234(K,V).
@@ -185,7 +185,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module std_util, require.
+:- import_module std_util, require, string.
%-----------------------------------------------------------------------------%
Index: library/math.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/math.m,v
retrieving revision 1.7
diff -u -r1.7 math.m
--- math.m 1997/04/14 06:13:07 1.7
+++ math.m 1997/05/20 05:49:34
@@ -20,7 +20,6 @@
:- module math.
:- interface.
-:- import_module float.
%---------------------------------------------------------------------------%
% Mathematical constants
Index: library/multi_map.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/multi_map.m,v
retrieving revision 1.1
diff -u -r1.1 multi_map.m
--- multi_map.m 1995/12/29 03:54:53 1.1
+++ multi_map.m 1997/05/20 06:01:25
@@ -21,7 +21,7 @@
:- module multi_map.
:- interface.
-:- import_module map, list, int, std_util.
+:- import_module map, list.
%-----------------------------------------------------------------------------%
@@ -187,6 +187,8 @@
%-----------------------------------------------------------------------------%
:- implementation.
+
+:- import_module std_util, int.
%-----------------------------------------------------------------------------%
Index: library/pqueue.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/pqueue.m,v
retrieving revision 1.7
diff -u -r1.7 pqueue.m
--- pqueue.m 1995/10/27 09:40:13 1.7
+++ pqueue.m 1997/05/20 06:01:59
@@ -24,7 +24,7 @@
:- interface.
-:- import_module list, std_util, assoc_list.
+:- import_module assoc_list.
:- type pqueue(_K, _V).
@@ -56,7 +56,7 @@
:- implementation.
-:- import_module int.
+:- import_module int, list, std_util.
:- type pqueue(K, V) ---> empty
; pqueue(int, K, V, pqueue(K, V), pqueue(K, V)).
Index: library/prolog.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/prolog.m,v
retrieving revision 1.1
diff -u -r1.1 prolog.m
--- prolog.m 1997/05/13 09:55:37 1.1
+++ prolog.m 1997/05/20 06:02:24
@@ -14,7 +14,7 @@
%-----------------------------------------------------------------------------%
:- module prolog.
:- interface.
-:- import_module int, std_util.
+:- import_module std_util.
% We define !/0 (and !/2 for dcgs) to be equivalent to `true'. This is for
% backwards compatibility with Prolog systems. But of course it only works
@@ -94,7 +94,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module require.
+:- import_module require, int.
/*********
% !/0 and !/2 currently defined in mercury_builtin.m, for historical reasons.
Index: library/queue.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/queue.m,v
retrieving revision 1.13
diff -u -r1.13 queue.m
--- queue.m 1997/05/20 01:52:49 1.13
+++ queue.m 1997/05/20 06:03:44
@@ -20,7 +20,7 @@
:- module queue.
:- interface.
-:- import_module int, list.
+:- import_module list.
:- type queue(T).
@@ -93,7 +93,7 @@
:- implementation.
-:- import_module list, std_util.
+:- import_module list, std_util, int.
:- type queue(T) == pair(list(T)).
Index: library/random.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/random.m,v
retrieving revision 1.10
diff -u -r1.10 random.m
--- random.m 1996/04/25 03:43:07 1.10
+++ random.m 1997/05/20 06:04:00
@@ -19,7 +19,7 @@
:- interface.
-:- import_module int, list.
+:- import_module list.
:- type random__supply.
@@ -38,7 +38,7 @@
%---------------------------------------------------------------------------%
:- implementation.
-:- import_module require.
+:- import_module require, int.
:- type random__supply == int. % I(j)
Index: library/rbtree.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/rbtree.m,v
retrieving revision 1.6
diff -u -r1.6 rbtree.m
--- rbtree.m 1995/10/27 09:40:14 1.6
+++ rbtree.m 1997/05/20 06:04:38
@@ -35,7 +35,7 @@
:- module rbtree.
:- interface.
-:- import_module list, std_util, assoc_list.
+:- import_module list, assoc_list.
:- type rbtree(Key, Value).
@@ -105,7 +105,7 @@
:- implementation.
-:- import_module int, require.
+:- import_module int, require, std_util.
:- type rbtree(K,V) ---> empty
Index: library/relation.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/relation.m,v
retrieving revision 1.14
diff -u -r1.14 relation.m
--- relation.m 1997/02/06 23:09:39 1.14
+++ relation.m 1997/05/20 05:51:17
@@ -18,7 +18,7 @@
:- module relation.
:- interface.
-:- import_module list, set, set_bbbtree, std_util, assoc_list.
+:- import_module list, set, set_bbbtree, assoc_list.
:- type relation(T).
Index: library/set_bbbtree.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/set_bbbtree.m,v
retrieving revision 1.6
diff -u -r1.6 set_bbbtree.m
--- set_bbbtree.m 1996/02/03 17:36:54 1.6
+++ set_bbbtree.m 1997/05/20 05:51:23
@@ -16,7 +16,7 @@
:- interface.
-:- import_module bool, list, std_util.
+:- import_module bool, list.
:- type set_bbbtree(T).
Index: library/set_ordlist.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/set_ordlist.m,v
retrieving revision 1.3
diff -u -r1.3 set_ordlist.m
--- set_ordlist.m 1996/11/25 10:10:38 1.3
+++ set_ordlist.m 1997/05/20 05:51:28
@@ -15,7 +15,7 @@
:- module set_ordlist.
:- interface.
-:- import_module bool, list, std_util.
+:- import_module bool, list.
:- type set_ordlist(_T).
Index: library/set_unordlist.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/set_unordlist.m,v
retrieving revision 1.7
diff -u -r1.7 set_unordlist.m
--- set_unordlist.m 1996/05/02 17:22:59 1.7
+++ set_unordlist.m 1997/05/20 05:51:34
@@ -15,7 +15,7 @@
:- module set_unordlist.
:- interface.
-:- import_module bool, list, std_util.
+:- import_module bool, list.
:- type set_unordlist(_T).
Index: library/stack.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/stack.m,v
retrieving revision 1.10
diff -u -r1.10 stack.m
--- stack.m 1995/10/05 11:31:45 1.10
+++ stack.m 1997/05/20 06:05:02
@@ -15,7 +15,7 @@
:- module stack.
:- interface.
-:- import_module int, std_util, list.
+:- import_module list.
:- type stack(_T).
@@ -81,7 +81,7 @@
:- implementation.
-:- import_module list, require.
+:- import_module list, require, std_util.
:- type stack(T) == list(T).
Index: library/string.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/string.m,v
retrieving revision 1.88
diff -u -r1.88 string.m
--- string.m 1997/02/19 05:33:01 1.88
+++ string.m 1997/05/20 06:06:03
@@ -17,7 +17,7 @@
%-----------------------------------------------------------------------------%
:- interface.
-:- import_module list, char, int, float, require, std_util.
+:- import_module list, char.
:- pred string__length(string, int).
:- mode string__length(in, out) is det.
@@ -300,7 +300,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module bool.
+:- import_module bool, std_util, int, float, require.
:- pred string__to_int_list(string, list(int)).
:- mode string__to_int_list(out, in) is det.
Index: library/term.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/term.m,v
retrieving revision 1.68
diff -u -r1.68 term.m
--- term.m 1997/05/20 01:52:53 1.68
+++ term.m 1997/05/20 06:06:38
@@ -15,7 +15,7 @@
:- module term.
:- interface.
-:- import_module int, string, float, list, map.
+:- import_module list, map.
%-----------------------------------------------------------------------------%
@@ -249,7 +249,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module std_util, require, uniq_array.
+:- import_module std_util, require, uniq_array, int, string.
%-----------------------------------------------------------------------------%
Index: library/term_io.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/term_io.m,v
retrieving revision 1.45
diff -u -r1.45 term_io.m
--- term_io.m 1997/05/01 09:56:04 1.45
+++ term_io.m 1997/05/20 06:07:35
@@ -16,7 +16,7 @@
:- module term_io.
:- interface.
-:- import_module io, int, float, string, list, varset, term, char.
+:- import_module io, varset, term.
% External interface: exported predicates
@@ -98,7 +98,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module std_util, require.
+:- import_module std_util, require, list, string, int, char.
:- import_module lexer, parser, ops.
term_io__read_term(Result) -->
Index: library/tree234.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/tree234.m,v
retrieving revision 1.19
diff -u -r1.19 tree234.m
--- tree234.m 1997/04/11 03:28:30 1.19
+++ tree234.m 1997/05/20 06:08:05
@@ -16,7 +16,7 @@
:- interface.
-:- import_module list, std_util, assoc_list.
+:- import_module list, assoc_list.
:- type tree234(K, V).
@@ -83,7 +83,7 @@
:- implementation.
-:- import_module int, require, bool.
+:- import_module int, require, bool, std_util.
:- type tree234(K, V) --->
empty
Index: library/uniq_array.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/uniq_array.m,v
retrieving revision 1.22
diff -u -r1.22 uniq_array.m
--- uniq_array.m 1997/05/20 01:52:55 1.22
+++ uniq_array.m 1997/05/20 06:08:43
@@ -17,7 +17,7 @@
:- module uniq_array.
:- interface.
-:- import_module int, list, term.
+:- import_module list, term.
:- type uniq_array(T).
@@ -195,7 +195,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module std_util.
+:- import_module std_util, int.
:- type uniq_array(T).
Index: library/varset.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/varset.m,v
retrieving revision 1.50
diff -u -r1.50 varset.m
--- varset.m 1996/10/30 06:48:34 1.50
+++ varset.m 1997/05/20 06:09:00
@@ -29,7 +29,7 @@
:- module varset.
:- interface.
-:- import_module string, term.
+:- import_module term.
:- type varset.
@@ -149,7 +149,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module int, list, map, std_util, assoc_list, set, require.
+:- import_module int, list, map, std_util, assoc_list, set, require, string.
:- type varset ---> varset(
var_supply,
Index: tests/invalid/type_loop.m
===================================================================
RCS file: /home/staff/zs/imp/tests/invalid/type_loop.m,v
retrieving revision 1.1
diff -u -r1.1 type_loop.m
--- type_loop.m 1996/11/02 12:42:44 1.1
+++ type_loop.m 1997/05/20 07:15:38
@@ -5,13 +5,13 @@
:- interface.
-:- import_module map, io.
-
+:- import_module io.
:- type foo.
:- pred main(io__state::di, io__state::uo) is det.
:- implementation.
+:- import_module map.
:- type foo == map(int, foo). % ps, this looks a bit suspect.
Index: tests/warnings/double_underscore.m
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/double_underscore.m,v
retrieving revision 1.1
diff -u -r1.1 double_underscore.m
--- double_underscore.m 1996/11/05 04:38:49 1.1
+++ double_underscore.m 1997/05/20 07:14:36
@@ -2,7 +2,7 @@
:- interface.
-:- import_module int.
+
:- pred p(int::in, int::out) is det.
Index: tests/warnings/duplicate_call.m
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/duplicate_call.m,v
retrieving revision 1.1
diff -u -r1.1 duplicate_call.m
--- duplicate_call.m 1997/01/20 03:33:41 1.1
+++ duplicate_call.m 1997/05/20 07:14:05
@@ -3,12 +3,12 @@
:- interface.
-:- import_module int.
:- pred dup_call(int::in, int::in, int::out) is det.
:- pred called(int::in, int::in, int::out) is det.
:- implementation.
+:- import_module int.
dup_call(Int1, Int2, Int) :-
called(Int1, Int2, Int3),
Index: tests/warnings/simple_code.m
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/simple_code.m,v
retrieving revision 1.1
diff -u -r1.1 simple_code.m
--- simple_code.m 1997/04/28 00:05:26 1.1
+++ simple_code.m 1997/05/20 07:12:40
@@ -1,8 +1,8 @@
:- module simple_code.
:- interface.
-:- import_module io.
:- pred p(int::in, int::out) is erroneous.
:- implementation.
+
:- import_module require.
p -->
(
Index: tests/warnings/singleton_test.m
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/singleton_test.m,v
retrieving revision 1.4
diff -u -r1.4 singleton_test.m
--- singleton_test.m 1997/04/29 10:57:07 1.4
+++ singleton_test.m 1997/05/20 07:11:57
@@ -1,6 +1,6 @@
:- module singleton_test.
:- interface.
-:- import_module list, int, io.
+:- import_module list, io.
:- pred my_append(list(int), list(int), list(int)).
:- mode my_append(in, in, out) is det.
@@ -15,8 +15,8 @@
:- mode my_c_pred(in, in, out) is det.
:- pred c_hello_world(string::in, io__state::di, io__state::uo) is det.
-
:- implementation.
+:- import_module int.
my_append([], L, L) :-
L = L2.
Index: tests/warnings/unused_args_test.m
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/unused_args_test.m,v
retrieving revision 1.1
diff -u -r1.1 unused_args_test.m
--- unused_args_test.m 1996/02/16 05:43:21 1.1
+++ unused_args_test.m 1997/05/20 07:11:04
@@ -4,13 +4,15 @@
:- interface.
-:- import_module char, int.
+
:- pred recursive(int::in, switch_test::in, int::in) is semidet.
:- pred nonrecursive(int::in) is semidet.
:- implementation.
+
+:- import_module char, int.
:- type switch_test --->
f1(int)
--
Tyson Dowd #
# Surreal humour isn't eveyone's cup of
trd at cs.mu.oz.au # fur.
http://www.cs.mu.oz.au/~trd #
More information about the developers
mailing list