[m-rev.] diff: clean up library and compiler imports

[Peter Ross]

Hi,

I've been slowly fixing some of the --warn-unused-imports errors.
Rather than waiting until all have been done.  I thought I would
check-in what I've done.

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


Estimated hours taken: 4
Branches: main

library/*.m:
compiler/*.m:
	Fix --warn-unused-imports warnings in some of the modules.

Index: library/array2d.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/array2d.m,v
retrieving revision 1.8
diff -U5 -r1.8 array2d.m
--- library/array2d.m	19 Apr 2006 05:17:49 -0000	1.8
+++ library/array2d.m	27 Sep 2006 06:07:57 -0000
@@ -19,11 +19,10 @@
 
 :- module array2d.
 :- interface.
 
 :- import_module array.
-:- import_module int.
 :- import_module list.
 
 %-----------------------------------------------------------------------------%
 
     % A array2d is a two-dimensional array stored in row-major order
@@ -126,10 +125,11 @@
 
 :- implementation.
 
 :- import_module array.
 :- import_module require.
+:- import_module int.
 
     % array2d(Rows, Cols, Array)
     %
 :- type array2d(T) ---> array2d(int, int, array(T)).
 
Index: library/benchmarking.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/benchmarking.m,v
retrieving revision 1.70
diff -U5 -r1.70 benchmarking.m
--- library/benchmarking.m	7 Aug 2006 06:21:30 -0000	1.70
+++ library/benchmarking.m	27 Sep 2006 06:07:57 -0000
@@ -17,12 +17,10 @@
 %-----------------------------------------------------------------------------%
 
 :- module benchmarking.
 :- interface.
 
-:- import_module int.
-
     % `report_stats' is a non-logical procedure intended for use in profiling
     % the performance of a program. It has the side-effect of reporting
     % some memory and time usage statistics about the time period since
     % the last call to report_stats to stderr.
     %
@@ -69,10 +67,12 @@
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
+
+:- import_module int.
 
 %-----------------------------------------------------------------------------%
 
 :- pragma foreign_decl("C", "
 
Index: library/bitmap.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/bitmap.m,v
retrieving revision 1.13
diff -U5 -r1.13 bitmap.m
--- library/bitmap.m	19 Apr 2006 05:17:50 -0000	1.13
+++ library/bitmap.m	27 Sep 2006 06:07:57 -0000
@@ -26,11 +26,10 @@
 
 :- interface.
 
 :- import_module array.
 :- import_module bool.
-:- import_module int.
 
 %-----------------------------------------------------------------------------%
 
 :- type bitmap.
 
@@ -162,10 +161,11 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module exception.
+:- import_module int.
 :- import_module require.
 
     % A bitmap is represented as an array of ints where each int stores
     % int.bits_per_int bits.  The first element of the array (index 0)
     % is used to hold the number of bits in the bitmap.  This avoids
Index: library/bt_array.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/bt_array.m,v
retrieving revision 1.17
diff -U5 -r1.17 bt_array.m
--- library/bt_array.m	19 Apr 2006 05:17:50 -0000	1.17
+++ library/bt_array.m	27 Sep 2006 06:07:57 -0000
@@ -27,11 +27,10 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- module bt_array.
 :- interface.
-:- import_module int.
 :- import_module list.
 
 :- type bt_array(T).
 
 %-----------------------------------------------------------------------------%
@@ -175,10 +174,11 @@
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module int.
 :- import_module require.
 :- import_module string.
 
 :- type bt_array(T)
     --->    bt_array(int, int, ra_list(T)).
Index: library/builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/builtin.m,v
retrieving revision 1.122
diff -U5 -r1.122 builtin.m
--- library/builtin.m	13 Jun 2006 05:55:50 -0000	1.122
+++ library/builtin.m	27 Sep 2006 06:07:57 -0000
@@ -412,17 +412,10 @@
 :- pred compare_representation(comparison_result, T, T).
 :- mode compare_representation(uo, in, in) is cc_multi.
 
 :- implementation.
 
-:- import_module char.
-:- import_module float.
-:- import_module int.
-:- import_module list.
-:- import_module require.
-:- import_module string.
-
 %-----------------------------------------------------------------------------%
 
 false :-
     fail.
 
Index: library/construct.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/construct.m,v
retrieving revision 1.29
diff -U5 -r1.29 construct.m
--- library/construct.m	19 Apr 2006 05:17:50 -0000	1.29
+++ library/construct.m	27 Sep 2006 06:07:57 -0000
@@ -91,12 +91,10 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- use_module rtti_implementation.
-
 :- pragma foreign_decl("C", "
 
 #include ""mercury_type_desc.h""
 #include ""mercury_construct.h""
 
Index: library/cord.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/cord.m,v
retrieving revision 1.6
diff -U5 -r1.6 cord.m
--- library/cord.m	19 Apr 2006 05:17:50 -0000	1.6
+++ library/cord.m	27 Sep 2006 06:07:57 -0000
@@ -25,11 +25,10 @@
 %---------------------------------------------------------------------------%
 
 :- module cord.
 :- interface.
 
-:- import_module int.
 :- import_module list.
 
     % Cords that contain the same members in the same order will not
     % necessarily have the same representation and will, therefore,
     % not necessarily either unify or compare as equal.
@@ -115,10 +114,12 @@
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
+
+:- import_module int.
 
     % We impose the following invariants to ensure we have a unique
     % representation for the empty cord (this makes the implementation
     % simpler.)
     %
Index: library/deconstruct.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/deconstruct.m,v
retrieving revision 1.39
diff -U5 -r1.39 deconstruct.m
--- library/deconstruct.m	22 Aug 2006 02:33:40 -0000	1.39
+++ library/deconstruct.m	27 Sep 2006 06:07:58 -0000
@@ -229,12 +229,10 @@
 
 :- implementation.
 
 :- import_module int.
 :- import_module require.
-:- import_module rtti_implementation.
-:- import_module string.
 
 :- pragma foreign_decl("C", "
 
 #include ""mercury_deconstruct.h""
 #include ""mercury_deconstruct_macros.h""
Index: library/dir.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/dir.m,v
retrieving revision 1.35
diff -U5 -r1.35 dir.m
--- library/dir.m	31 Aug 2006 11:09:51 -0000	1.35
+++ library/dir.m	27 Sep 2006 06:07:58 -0000
@@ -26,11 +26,10 @@
 :- interface.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 %
 % Predicates to isolate system dependencies
 %
@@ -251,15 +250,15 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module char.
-:- import_module enum.
 :- import_module exception.
 :- import_module int.
 :- import_module require.
 :- import_module std_util.
+:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 dir.directory_separator = (if have_win32 then ('\\') else ('/')).
 
Index: library/graph.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/graph.m,v
retrieving revision 1.31
diff -U5 -r1.31 graph.m
--- library/graph.m	7 Sep 2006 08:32:20 -0000	1.31
+++ library/graph.m	27 Sep 2006 06:07:58 -0000
@@ -168,11 +168,10 @@
 %------------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module counter.
-:- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module require.
 
 :- use_module solutions.
Index: library/group.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/group.m,v
retrieving revision 1.27
diff -U5 -r1.27 group.m
--- library/group.m	19 Apr 2006 05:17:52 -0000	1.27
+++ library/group.m	27 Sep 2006 06:07:58 -0000
@@ -87,11 +87,10 @@
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module counter.
-:- import_module int.
 :- import_module map.
 :- import_module pair.
 :- import_module require.
 
 :- type group(T)
Index: library/hash_table.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/hash_table.m,v
retrieving revision 1.16
diff -U5 -r1.16 hash_table.m
--- library/hash_table.m	19 Apr 2006 05:17:52 -0000	1.16
+++ library/hash_table.m	27 Sep 2006 06:07:58 -0000
@@ -41,13 +41,10 @@
 
 :- import_module array.
 :- import_module assoc_list.
 :- import_module bitmap.
 :- import_module char.
-:- import_module float.
-:- import_module int.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 :- type hash_table(K, V).
 
@@ -209,14 +206,16 @@
 :- implementation.
 
 :- import_module bool.
 :- import_module deconstruct.
 :- import_module exception.
+:- import_module float.
+:- import_module int.
 :- import_module list.
-:- import_module math.
 :- import_module pair.
 :- import_module require.
+:- import_module string.
 :- import_module type_desc.
 :- import_module univ.
 
 %-----------------------------------------------------------------------------%
 
Index: library/integer.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/integer.m,v
retrieving revision 1.24
diff -U5 -r1.24 integer.m
--- library/integer.m	19 Apr 2006 05:17:52 -0000	1.24
+++ library/integer.m	27 Sep 2006 06:07:58 -0000
@@ -22,13 +22,10 @@
 %-----------------------------------------------------------------------------%
 
 :- module integer.
 :- interface.
 
-:- import_module float.
-:- import_module string.
-
 :- type integer.
 
 :- pred '<'(integer::in, integer::in) is semidet.
 
 :- pred '>'(integer::in, integer::in) is semidet.
@@ -98,13 +95,15 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module char.
+:- import_module float.
 :- import_module int.
 :- import_module list.
 :- import_module require.
+:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 % Possible improvements:
 %
Index: library/io.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/io.m,v
retrieving revision 1.357
diff -U5 -r1.357 io.m
--- library/io.m	25 Sep 2006 02:44:44 -0000	1.357
+++ library/io.m	27 Sep 2006 06:08:00 -0000
@@ -1524,11 +1524,10 @@
 :- import_module parser.
 :- import_module require.
 :- import_module term.
 :- import_module term_io.
 :- import_module type_desc.
-:- import_module varset.
 
 :- use_module rtti_implementation.
 :- use_module table_builtin.
 
 :- pragma foreign_import_module(c, string).
Index: library/list.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/list.m,v
retrieving revision 1.154
diff -U5 -r1.154 list.m
--- library/list.m	20 Sep 2006 09:42:24 -0000	1.154
+++ library/list.m	27 Sep 2006 06:08:00 -0000
@@ -16,11 +16,10 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- module list.
 :- interface.
-:- import_module int.
 
 %-----------------------------------------------------------------------------%
 
     % The definition of the type `list(T)':
     % A list is either an empty list, denoted `[]',
@@ -1229,10 +1228,11 @@
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module int.
 :- import_module require.
 :- import_module set_tree234.
 :- import_module string.
 
 %-----------------------------------------------------------------------------%
Index: library/multi_map.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/multi_map.m,v
retrieving revision 1.23
diff -U5 -r1.23 multi_map.m
--- library/multi_map.m	19 Apr 2006 05:17:53 -0000	1.23
+++ library/multi_map.m	27 Sep 2006 06:08:00 -0000
@@ -258,11 +258,10 @@
 :- implementation.
 
 :- import_module int.
 :- import_module pair.
 :- import_module require.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 multi_map.init(M) :-
     map.init(M).
Index: library/pprint.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/pprint.m,v
retrieving revision 1.25
diff -U5 -r1.25 pprint.m
--- library/pprint.m	20 Sep 2006 09:42:25 -0000	1.25
+++ library/pprint.m	27 Sep 2006 06:08:00 -0000
@@ -152,12 +152,10 @@
 
 :- module pprint.
 :- interface.
 
 :- import_module char.
-:- import_module float.
-:- import_module int.
 :- import_module io.
 :- import_module list.
 :- import_module string.
 :- import_module univ.
 
@@ -377,11 +375,11 @@
 :- implementation.
 
 :- import_module array.
 :- import_module deconstruct.
 :- import_module enum.
-:- import_module exception.
+:- import_module int.
 :- import_module map.
 :- import_module ops.
 :- import_module pair.
 :- import_module robdd.
 :- import_module sparse_bitset.
Index: library/private_builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/private_builtin.m,v
retrieving revision 1.161
diff -U5 -r1.161 private_builtin.m
--- library/private_builtin.m	20 Aug 2006 05:44:09 -0000	1.161
+++ library/private_builtin.m	27 Sep 2006 06:08:00 -0000
@@ -114,11 +114,10 @@
 :- import_module int.
 :- import_module list.
 :- import_module require.
 :- import_module string.
 :- import_module type_desc.
-:- import_module univ.
 
 :- pragma foreign_code("C#", "
 
 // The dummy_var is used to represent io.states and other Mercury
 // parameters that are not really passed around.  Occasionally a dummy variable
Index: library/rtree.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/rtree.m,v
retrieving revision 1.3
diff -U5 -r1.3 rtree.m
--- library/rtree.m	19 Apr 2006 05:17:55 -0000	1.3
+++ library/rtree.m	27 Sep 2006 06:08:01 -0000
@@ -192,11 +192,10 @@
 :- implementation.
 
 :- import_module float.
 :- import_module int.
 :- import_module require.
-:- import_module std_util.
 
 %---------------------------------------------------------------------------%
 
     % The empty rtree and singleton rtrees are treated as a special case.
     %
Index: library/set.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/set.m,v
retrieving revision 1.77
diff -U5 -r1.77 set.m
--- library/set.m	19 Apr 2006 05:17:56 -0000	1.77
+++ library/set.m	27 Sep 2006 06:08:01 -0000
@@ -338,11 +338,10 @@
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module require.
 :- import_module set_ordlist.
 :- import_module set_unordlist.
 
 :- type set(T) ==   set_ordlist(T).
 
Index: library/std_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/std_util.m,v
retrieving revision 1.313
diff -U5 -r1.313 std_util.m
--- library/std_util.m	19 Apr 2006 05:17:57 -0000	1.313
+++ library/std_util.m	27 Sep 2006 06:08:01 -0000
@@ -17,11 +17,10 @@
 %-----------------------------------------------------------------------------%
 
 :- module std_util.
 :- interface.
 
-:- import_module int.
 :- import_module maybe.
 
 %-----------------------------------------------------------------------------%
 %
 % General purpose higher-order programming constructs
@@ -73,10 +72,12 @@
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
+
+:- import_module int.
 
 %-----------------------------------------------------------------------------%
 
 maybe_pred(Pred, X, Y) :-
     Y = ( Pred(X, Z) -> yes(Z) ; no ).
Index: library/svvarset.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/svvarset.m,v
retrieving revision 1.8
diff -U5 -r1.8 svvarset.m
--- library/svvarset.m	19 Apr 2006 05:17:58 -0000	1.8
+++ library/svvarset.m	27 Sep 2006 06:08:01 -0000
@@ -22,11 +22,10 @@
 :- interface.
 
 :- import_module list.
 :- import_module maybe.
 :- import_module set.
-:- import_module string.
 :- import_module term.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
Index: library/term.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/term.m,v
retrieving revision 1.122
diff -U5 -r1.122 term.m
--- library/term.m	20 Sep 2006 09:42:25 -0000	1.122
+++ library/term.m	27 Sep 2006 06:08:01 -0000
@@ -453,15 +453,12 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module array.
-:- import_module bool.
-:- import_module char.
 :- import_module construct.
 :- import_module deconstruct.
-:- import_module float.
 :- import_module int.
 :- import_module require.
 :- import_module string.
 :- import_module svmap.
 
Index: library/term_io.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/term_io.m,v
retrieving revision 1.81
diff -U5 -r1.81 term_io.m
--- library/term_io.m	20 Sep 2006 09:42:25 -0000	1.81
+++ library/term_io.m	27 Sep 2006 06:08:01 -0000
@@ -199,11 +199,10 @@
 :- import_module char.
 :- import_module int.
 :- import_module lexer.
 :- import_module list.
 :- import_module parser.
-:- import_module require.
 :- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 term_io.read_term(Result, !IO) :-
Index: library/term_size_prof_builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/term_size_prof_builtin.m,v
retrieving revision 1.8
diff -U5 -r1.8 term_size_prof_builtin.m
--- library/term_size_prof_builtin.m	19 Apr 2006 05:17:59 -0000	1.8
+++ library/term_size_prof_builtin.m	27 Sep 2006 06:08:01 -0000
@@ -74,13 +74,10 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module int.
-:- import_module require.
-
 %---------------------------------------------------------------------------%
 
 
 :- pragma foreign_decl("C", "
 #ifndef MR_TERM_SIZE_PROFILING_GUARD
Index: library/term_to_xml.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/term_to_xml.m,v
retrieving revision 1.15
diff -U5 -r1.15 term_to_xml.m
--- library/term_to_xml.m	25 Sep 2006 01:56:16 -0000	1.15
+++ library/term_to_xml.m	27 Sep 2006 06:08:01 -0000
@@ -52,11 +52,10 @@
 
 :- module term_to_xml.
 :- interface.
 
 :- import_module deconstruct.
-:- import_module int.
 :- import_module io.
 :- import_module list.
 :- import_module maybe.
 :- import_module type_desc.
 
@@ -523,15 +522,15 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module array.
 :- import_module bool.
 :- import_module char.
 :- import_module construct.
 :- import_module exception.
+:- import_module int.
 :- import_module map.
 :- import_module require.
 :- import_module string.
 :- import_module unit.
 :- import_module univ.
Index: library/version_array.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/version_array.m,v
retrieving revision 1.11
diff -U5 -r1.11 version_array.m
--- library/version_array.m	25 Aug 2006 07:02:49 -0000	1.11
+++ library/version_array.m	27 Sep 2006 06:08:01 -0000
@@ -33,11 +33,10 @@
 %-----------------------------------------------------------------------------%
 
 :- module version_array.
 :- interface.
 
-:- import_module int.
 :- import_module list.
 
 :- type version_array(T).
 
     % empty_array returns the empty array.
@@ -137,11 +136,11 @@
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module array.
+:- import_module int.
 :- import_module require.
 
 %-----------------------------------------------------------------------------%
 
 init(N, X) = version_array.new(N, X).
Index: library/version_array2d.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/version_array2d.m,v
retrieving revision 1.5
diff -U5 -r1.5 version_array2d.m
--- library/version_array2d.m	19 Apr 2006 05:17:59 -0000	1.5
+++ library/version_array2d.m	27 Sep 2006 06:08:01 -0000
@@ -18,11 +18,10 @@
 %-----------------------------------------------------------------------------%
 
 :- module version_array2d.
 :- interface.
 
-:- import_module int.
 :- import_module list.
 
 %-----------------------------------------------------------------------------%
 
     % A version_array2d is a two-dimensional version array stored in row-major
@@ -106,10 +105,11 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module int.
 :- import_module require.
 :- import_module string.
 :- import_module version_array.
 
 %-----------------------------------------------------------------------------%
Index: library/version_bitmap.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/version_bitmap.m,v
retrieving revision 1.5
diff -U5 -r1.5 version_bitmap.m
--- library/version_bitmap.m	25 Aug 2006 07:02:49 -0000	1.5
+++ library/version_bitmap.m	27 Sep 2006 06:08:01 -0000
@@ -23,11 +23,10 @@
 
 :- module version_bitmap.
 :- interface.
 
 :- import_module bool.
-:- import_module int.
 
 %-----------------------------------------------------------------------------%
 
 :- type version_bitmap.
 
@@ -107,10 +106,11 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module exception.
+:- import_module int.
 :- import_module require.
 :- import_module version_array.
 
     % A version_bitmap is represented as an array of ints where each int stores
     % int.bits_per_int bits.  The first element of the array (index 0)
Index: library/version_hash_table.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/version_hash_table.m,v
retrieving revision 1.7
diff -U5 -r1.7 version_hash_table.m
--- library/version_hash_table.m	19 Apr 2006 05:18:00 -0000	1.7
+++ library/version_hash_table.m	27 Sep 2006 06:08:01 -0000
@@ -24,13 +24,10 @@
 :- module version_hash_table.
 :- interface.
 
 :- import_module assoc_list.
 :- import_module char.
-:- import_module float.
-:- import_module int.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 :- type version_hash_table(K, V).
 
@@ -149,17 +146,18 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module array.
-:- import_module bool.
 :- import_module deconstruct.
 :- import_module exception.
+:- import_module float.
+:- import_module int.
 :- import_module list.
-:- import_module math.
 :- import_module pair.
 :- import_module require.
+:- import_module string.
 :- import_module type_desc.
 :- import_module univ.
 :- import_module version_array.
 
 %-----------------------------------------------------------------------------%
Index: library/version_store.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/version_store.m,v
retrieving revision 1.5
diff -U5 -r1.5 version_store.m
--- library/version_store.m	19 Apr 2006 05:18:00 -0000	1.5
+++ library/version_store.m	27 Sep 2006 06:08:01 -0000
@@ -99,11 +99,10 @@
 
 :- implementation.
 
 :- import_module counter.
 :- import_module int.
-:- import_module list.
 :- import_module unit.
 :- import_module univ.
 :- import_module version_array.
 
 %-----------------------------------------------------------------------------%
Index: compiler/abstract_mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/abstract_mode_constraints.m,v
retrieving revision 1.10
diff -U5 -r1.10 abstract_mode_constraints.m
--- compiler/abstract_mode_constraints.m	20 Sep 2006 09:42:02 -0000	1.10
+++ compiler/abstract_mode_constraints.m	27 Sep 2006 06:08:02 -0000
@@ -16,11 +16,13 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.abstract_mode_constraints.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module io.
Index: compiler/backend_libs.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/backend_libs.m,v
retrieving revision 1.10
diff -U5 -r1.10 backend_libs.m
--- compiler/backend_libs.m	12 Oct 2005 23:51:33 -0000	1.10
+++ compiler/backend_libs.m	27 Sep 2006 06:08:02 -0000
@@ -11,12 +11,10 @@
 % This package contains utility modules that are each used by
 % several different back-ends.
 %
 :- module backend_libs.
 :- interface.
-:- import_module hlds.
-:- import_module parse_tree.
 
 % modules that provide functionality used by several different back-ends
 :- include_module base_typeclass_info.
 :- include_module builtin_ops.
 :- include_module bytecode_data.
@@ -33,13 +31,9 @@
 :- include_module switch_util.
 :- include_module type_ctor_info.
 :- include_module type_class_info.
 
 :- implementation.
-
-:- import_module check_hlds.        % needed for type_util, mode_util
-:- import_module libs.
-:- import_module mdbcomp.
 
 :- end_module backend_libs.
 
 %-----------------------------------------------------------------------------%
Index: compiler/base_typeclass_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/base_typeclass_info.m,v
retrieving revision 1.48
diff -U5 -r1.48 base_typeclass_info.m
--- compiler/base_typeclass_info.m	20 Sep 2006 09:42:02 -0000	1.48
+++ compiler/base_typeclass_info.m	27 Sep 2006 06:08:02 -0000
@@ -23,10 +23,11 @@
 
 :- module backend_libs.base_typeclass_info.
 :- interface.
 
 :- import_module backend_libs.rtti.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
 :- import_module list.
 
 %---------------------------------------------------------------------------%
@@ -38,23 +39,20 @@
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module backend_libs.type_class_info.
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_code_util.
 :- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
-:- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_io.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module int.
Index: compiler/build_mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/build_mode_constraints.m,v
retrieving revision 1.20
diff -U5 -r1.20 build_mode_constraints.m
--- compiler/build_mode_constraints.m	20 Sep 2006 09:42:02 -0000	1.20
+++ compiler/build_mode_constraints.m	27 Sep 2006 06:08:03 -0000
@@ -18,13 +18,15 @@
 :- module check_hlds.build_mode_constraints.
 :- interface.
 
 :- import_module check_hlds.abstract_mode_constraints.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bimap.
 :- import_module list.
 :- import_module set.
@@ -191,27 +193,21 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.goal_path.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.mode_util.
 :- import_module hlds.hlds_clauses.
-:- import_module hlds.hlds_data.
-:- import_module hlds.passes_aux.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module parse_tree.prog_mode.
-:- import_module transform_hlds.dependency_graph.
 
 :- import_module bool.
-:- import_module int.
 :- import_module map.
 :- import_module maybe.
 :- import_module multi_map.
 :- import_module pair.
-:- import_module sparse_bitset.
 :- import_module string.
 :- import_module svbimap.
 :- import_module svmulti_map.
 :- import_module svvarset.
 :- import_module term.
Index: compiler/builtin_ops.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/builtin_ops.m,v
retrieving revision 1.26
diff -U5 -r1.26 builtin_ops.m
--- compiler/builtin_ops.m	14 Aug 2006 03:31:31 -0000	1.26
+++ compiler/builtin_ops.m	27 Sep 2006 06:08:03 -0000
@@ -17,11 +17,13 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.builtin_ops.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_pred.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 
 :- import_module list.
 
 %-----------------------------------------------------------------------------%
Index: compiler/bytecode.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/bytecode.m,v
retrieving revision 1.69
diff -U5 -r1.69 bytecode.m
--- compiler/bytecode.m	22 Aug 2006 05:03:38 -0000	1.69
+++ compiler/bytecode.m	27 Sep 2006 06:08:03 -0000
@@ -14,14 +14,19 @@
 %---------------------------------------------------------------------------%
 
 :- module bytecode_backend.bytecode.
 :- interface.
 
+:- import_module backend_libs.
 :- import_module backend_libs.builtin_ops.
+:- import_module hlds.
 :- import_module hlds.hlds_data.
+:- import_module libs.
 :- import_module libs.tree.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module char.
 :- import_module io.
 :- import_module list.
@@ -145,17 +150,13 @@
 
 :- implementation.
 
 :- import_module backend_libs.bytecode_data.
 :- import_module backend_libs.c_util.
-:- import_module hlds.hlds_pred.
 :- import_module libs.compiler_util.
-:- import_module parse_tree.prog_out.
 
 :- import_module assoc_list.
-:- import_module int.
-:- import_module library.
 :- import_module string.
 
 %---------------------------------------------------------------------------%
 
 :- pred bytecode.version(int::out) is det.
Index: compiler/bytecode_backend.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/bytecode_backend.m,v
retrieving revision 1.5
diff -U5 -r1.5 bytecode_backend.m
--- compiler/bytecode_backend.m	24 Mar 2006 03:03:38 -0000	1.5
+++ compiler/bytecode_backend.m	27 Sep 2006 06:08:03 -0000
@@ -10,26 +10,16 @@
 % the bytecodes that this back-end generates, is not yet implemented.
 %
 :- module bytecode_backend.
 :- interface.
 
-:- import_module backend_libs.
-:- import_module check_hlds.        % for type_util and mode_util
-:- import_module hlds.
-:- import_module libs.
-:- import_module mdbcomp.
-:- import_module parse_tree.
-
 %-----------------------------------------------------------------------------%
 
 :- include_module bytecode.
 :- include_module bytecode_gen.
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
-    % bytecode_gen uses ll_backend__call_gen.m
-:- import_module ll_backend.
-
 :- end_module bytecode_backend.
 
 %-----------------------------------------------------------------------------%
Index: compiler/bytecode_data.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/bytecode_data.m,v
retrieving revision 1.21
diff -U5 -r1.21 bytecode_data.m
--- compiler/bytecode_data.m	17 Mar 2006 01:40:12 -0000	1.21
+++ compiler/bytecode_data.m	27 Sep 2006 06:08:03 -0000
@@ -15,14 +15,12 @@
 %---------------------------------------------------------------------------%
 
 :- module backend_libs.bytecode_data.
 :- interface.
 
-:- import_module int.
 :- import_module io.
 :- import_module list.
-:- import_module string.
 
 %---------------------------------------------------------------------------%
 
     % XXX this assumes strings contain 8-bit characters
 :- pred output_string(string::in, io::di, io::uo) is det.
@@ -62,13 +60,16 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module char.
+:- import_module int.
+:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 output_string(Val, !IO) :-
     % XXX this assumes strings contain 8-bit characters
Index: compiler/bytecode_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/bytecode_gen.m,v
retrieving revision 1.109
diff -U5 -r1.109 bytecode_gen.m
--- compiler/bytecode_gen.m	22 Aug 2006 05:03:38 -0000	1.109
+++ compiler/bytecode_gen.m	27 Sep 2006 06:08:03 -0000
@@ -16,10 +16,11 @@
 
 :- module bytecode_backend.bytecode_gen.
 :- interface.
 
 :- import_module bytecode_backend.bytecode.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
 :- import_module io.
 :- import_module list.
 
@@ -41,32 +42,35 @@
 %
 % XXX It might be nice to move the argument passing related stuff
 % in call_gen.m that we use here into arg_info.m, and to then rework
 % arg_info.m so that it didn't depend on the LLDS.
 
+:- import_module backend_libs.
 :- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.    % for type_util and mode_util
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.type_util.
 :- import_module hlds.arg_info.
 :- import_module hlds.code_model.
 :- import_module hlds.goal_util.
 :- import_module hlds.hlds_code_util.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.passes_aux.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
 :- import_module libs.tree.
+:- import_module ll_backend.  	% bytecode_gen uses ll_backend__call_gen.m
 :- import_module ll_backend.call_gen.  % XXX for arg passing convention
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 
 :- import_module assoc_list.
-:- import_module bool.
 :- import_module counter.
 :- import_module deconstruct.
 :- import_module int.
 :- import_module list.
 :- import_module map.
Index: compiler/c_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/c_util.m,v
retrieving revision 1.33
diff -U5 -r1.33 c_util.m
--- compiler/c_util.m	31 Jul 2006 08:31:29 -0000	1.33
+++ compiler/c_util.m	27 Sep 2006 06:08:03 -0000
@@ -20,15 +20,13 @@
 :- module backend_libs.c_util.
 :- interface.
 
 :- import_module backend_libs.builtin_ops.
 
+
 :- import_module char.
-:- import_module int.
 :- import_module io.
-:- import_module string.
-
 %-----------------------------------------------------------------------------%
 %
 % Line numbering.
 
     % set_line_num(FileName, LineNum):
@@ -150,18 +148,18 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module backend_libs.name_mangle.
+:- import_module libs.
 :- import_module libs.globals.
 :- import_module libs.options.
-:- import_module parse_tree.prog_foreign.
-:- import_module mdbcomp.prim_data.
 
 :- import_module bool.
+:- import_module int.
 :- import_module list.
+:- import_module string.
 
 %-----------------------------------------------------------------------------%
 %
 % Line numbering.
 
Index: compiler/check_hlds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/check_hlds.m,v
retrieving revision 1.16
diff -U5 -r1.16 check_hlds.m
--- compiler/check_hlds.m	15 Sep 2006 11:14:32 -0000	1.16
+++ compiler/check_hlds.m	27 Sep 2006 06:08:03 -0000
@@ -9,17 +9,10 @@
 % check_hlds: semantic analysis and error checking (the "front end" HLDS pass).
 
 :- module check_hlds.
 :- interface.
 
-:- import_module hlds.
-:- import_module mdbcomp.
-:- import_module parse_tree.
-
-% :- import_module check_hlds.type_analysis.
-% :- import_module check_hlds.mode_analysis.
-
 %-----------------------------------------------------------------------------%
 
 % Type checking
 %:- module type_analysis.
     :- include_module check_typeclass.
@@ -89,12 +82,9 @@
 :- include_module goal_path.
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
-
-:- import_module libs.
-:- import_module transform_hlds.    % for pd_cost, etc.
 
 :- end_module check_hlds.
 
 %-----------------------------------------------------------------------------%
Index: compiler/check_typeclass.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/check_typeclass.m,v
retrieving revision 1.100
diff -U5 -r1.100 check_typeclass.m
--- compiler/check_typeclass.m	20 Sep 2006 09:42:02 -0000	1.100
+++ compiler/check_typeclass.m	27 Sep 2006 06:08:04 -0000
@@ -65,10 +65,11 @@
 %---------------------------------------------------------------------------%
 
 :- module check_hlds.check_typeclass.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.make_hlds.
 
 :- import_module bool.
 :- import_module io.
@@ -79,37 +80,34 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.inst_match.
-:- import_module check_hlds.mode_util.
 :- import_module check_hlds.typeclasses.
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_code_util.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
-:- import_module hlds.hlds_goal.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
-:- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module multi_map.
 :- import_module pair.
Index: compiler/clause_to_proc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/clause_to_proc.m,v
retrieving revision 1.70
diff -U5 -r1.70 clause_to_proc.m
--- compiler/clause_to_proc.m	22 Aug 2006 05:03:39 -0000	1.70
+++ compiler/clause_to_proc.m	27 Sep 2006 06:08:04 -0000
@@ -7,10 +7,11 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.clause_to_proc.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.pred_table.
 
@@ -64,26 +65,24 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.purity.
 :- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.make_hlds.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 
 :- import_module assoc_list.
-:- import_module bool.
 :- import_module int.
 :- import_module map.
 :- import_module pair.
 :- import_module set.
 :- import_module string.
Index: compiler/common.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/common.m,v
retrieving revision 1.98
diff -U5 -r1.98 common.m
--- compiler/common.m	22 Aug 2006 05:03:40 -0000	1.98
+++ compiler/common.m	27 Sep 2006 06:08:04 -0000
@@ -30,12 +30,14 @@
 
 :- module check_hlds.common.
 :- interface.
 
 :- import_module check_hlds.simplify.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module list.
 
 %---------------------------------------------------------------------------%
@@ -88,35 +90,26 @@
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.det_report.
-:- import_module check_hlds.det_util.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.polymorphism.
-:- import_module check_hlds.type_util.
-:- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.instmap.
-:- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
-:- import_module libs.options.
 :- import_module parse_tree.prog_type.
-:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.    % for pd_cost, etc.
 :- import_module transform_hlds.pd_cost.
 
-:- import_module bool.
 :- import_module eqvclass.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module set.
-:- import_module string.
 :- import_module sveqvclass.
 :- import_module svmap.
 :- import_module term.
 
 %---------------------------------------------------------------------------%
Index: compiler/compile_target_code.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.92
diff -U5 -r1.92 compile_target_code.m
--- compiler/compile_target_code.m	22 Aug 2006 05:03:40 -0000	1.92
+++ compiler/compile_target_code.m	27 Sep 2006 06:08:04 -0000
@@ -14,13 +14,16 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.compile_target_code.
 :- interface.
 
+:- import_module parse_tree.
 :- import_module parse_tree.prog_io.
 :- import_module parse_tree.modules.
+:- import_module libs.
 :- import_module libs.globals.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
@@ -166,26 +169,24 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module backend_libs.foreign.
-:- import_module backend_libs.name_mangle.
+:- import_module hlds.
+
 :- import_module hlds.passes_aux.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.handle_options.
 :- import_module libs.options.
 :- import_module libs.trace_params.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_foreign.
 :- import_module parse_tree.prog_out.
 
-:- import_module char.
 :- import_module dir.
 :- import_module getopt_io.
-:- import_module int.
 :- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 il_assemble(ErrorStream, ModuleName, HasMain, Succeeded, !IO) :-
Index: compiler/cse_detection.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/cse_detection.m,v
retrieving revision 1.103
diff -U5 -r1.103 cse_detection.m
--- compiler/cse_detection.m	20 Aug 2006 08:20:56 -0000	1.103
+++ compiler/cse_detection.m	27 Sep 2006 06:08:08 -0000
@@ -18,10 +18,11 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.cse_detection.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 
 :- import_module io.
 
@@ -33,38 +34,35 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.det_util.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.modes.
-:- import_module check_hlds.mode_util.
 :- import_module check_hlds.switch_detection.
 :- import_module check_hlds.switch_detection.
 :- import_module check_hlds.type_util.
 :- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_out.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.instmap.
 :- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_out.
-:- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module int.
 :- import_module list.
 :- import_module map.
-:- import_module multi_map.
 :- import_module pair.
 :- import_module set.
 :- import_module string.
 :- import_module svmap.
 :- import_module term.
Index: compiler/delay_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/delay_info.m,v
retrieving revision 1.28
diff -U5 -r1.28 delay_info.m
--- compiler/delay_info.m	31 Jul 2006 08:31:34 -0000	1.28
+++ compiler/delay_info.m	27 Sep 2006 06:08:08 -0000
@@ -18,11 +18,13 @@
 
 :- module check_hlds.delay_info.
 :- interface.
 
 :- import_module check_hlds.mode_errors.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module list.
 
 %-----------------------------------------------------------------------------%
@@ -87,10 +89,11 @@
 
 :- implementation.
 
 :- import_module check_hlds.mode_errors.   % for the mode_error_info
                                             % and delay_info types.
+:- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module int.
 :- import_module map.
 :- import_module pair.
Index: compiler/det_analysis.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/det_analysis.m,v
retrieving revision 1.199
diff -U5 -r1.199 det_analysis.m
--- compiler/det_analysis.m	22 Aug 2006 05:03:42 -0000	1.199
+++ compiler/det_analysis.m	27 Sep 2006 06:08:08 -0000
@@ -49,15 +49,18 @@
 :- module check_hlds.det_analysis.
 :- interface.
 
 :- import_module check_hlds.det_report.
 :- import_module check_hlds.det_util.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.instmap.
+:- import_module libs.
 :- import_module libs.globals.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module io.
 :- import_module list.
 :- import_module maybe.
@@ -106,21 +109,17 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.modecheck_call.
-:- import_module check_hlds.mode_util.
-:- import_module check_hlds.purity.
 :- import_module check_hlds.type_util.
 :- import_module hlds.code_model.
 :- import_module hlds.goal_util.
 :- import_module hlds.hlds_out.
-:- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
 :- import_module libs.compiler_util.
 :- import_module libs.options.
-:- import_module parse_tree.error_util.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_out.
 
 :- import_module assoc_list.
Index: compiler/det_report.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/det_report.m,v
retrieving revision 1.129
diff -U5 -r1.129 det_report.m
--- compiler/det_report.m	18 Sep 2006 03:01:29 -0000	1.129
+++ compiler/det_report.m	27 Sep 2006 06:08:09 -0000
@@ -17,21 +17,23 @@
 
 :- module check_hlds.det_report.
 :- interface.
 
 :- import_module check_hlds.det_util.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module io.
 :- import_module list.
 :- import_module pair.
 :- import_module set.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 :- type context_det_msg
     --->    context_det_msg(prog_context, det_msg).
@@ -172,25 +174,21 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.inst_match.
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_out.
-:- import_module hlds.passes_aux.
-:- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.mercury_to_mercury.
-:- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
Index: compiler/det_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/det_util.m,v
retrieving revision 1.40
diff -U5 -r1.40 det_util.m
--- compiler/det_util.m	20 Sep 2006 09:42:03 -0000	1.40
+++ compiler/det_util.m	27 Sep 2006 06:08:09 -0000
@@ -16,16 +16,19 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.det_util.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.instmap.
+:- import_module libs.
 :- import_module libs.globals.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 :- import_module set.
@@ -85,15 +88,12 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.inst_match.
-:- import_module check_hlds.type_util.
 :- import_module libs.compiler_util.
 :- import_module libs.options.
-:- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 
 :- import_module map.
 :- import_module term.
Index: compiler/export.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/export.m,v
retrieving revision 1.104
diff -U5 -r1.104 export.m
--- compiler/export.m	22 Aug 2006 05:03:44 -0000	1.104
+++ compiler/export.m	27 Sep 2006 06:08:09 -0000
@@ -18,12 +18,15 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.export.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_foreign.
 
 :- import_module io.
 
@@ -76,10 +79,13 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module check_hlds.        % needed for type_util, mode_util
+:- import_module libs.
+
 :- import_module backend_libs.c_util.
 :- import_module backend_libs.foreign.
 :- import_module backend_libs.name_mangle.
 :- import_module backend_libs.proc_label.
 :- import_module check_hlds.type_util.
@@ -87,11 +93,10 @@
 :- import_module hlds.code_model.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.pred_table.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
-:- import_module libs.options.
 :- import_module parse_tree.modules.
 :- import_module parse_tree.prog_foreign.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
@@ -102,11 +107,10 @@
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module string.
 :- import_module term.
-:- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 get_foreign_export_decls(HLDS, ForeignExportDecls) :-
     module_info_get_predicate_table(HLDS, PredicateTable),
Index: compiler/foreign.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/foreign.m,v
retrieving revision 1.65
diff -U5 -r1.65 foreign.m
--- compiler/foreign.m	10 Sep 2006 23:38:59 -0000	1.65
+++ compiler/foreign.m	27 Sep 2006 06:08:09 -0000
@@ -19,23 +19,25 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.foreign.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module libs.globals.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_foreign.
 
 :- import_module bool.
 :- import_module list.
 :- import_module maybe.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
     % A type which is used to determine the string representation of a
     % mercury type for various foreign languages.
@@ -150,22 +152,21 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module backend_libs.name_mangle.
+:- import_module check_hlds.        % needed for type_util, mode_util
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.type_util.
 :- import_module hlds.code_model.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
-:- import_module parse_tree.modules.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
 :- import_module int.
Index: compiler/format_call.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/format_call.m,v
retrieving revision 1.5
diff -U5 -r1.5 format_call.m
--- compiler/format_call.m	31 Jul 2006 08:31:37 -0000	1.5
+++ compiler/format_call.m	27 Sep 2006 06:08:09 -0000
@@ -79,14 +79,17 @@
 
 :- module check_hlds.format_call.
 :- interface.
 
 :- import_module check_hlds.det_report.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 
 :- import_module list.
 :- import_module set.
 
@@ -102,10 +105,11 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module hlds.hlds_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module counter.
 :- import_module exception.
 :- import_module map.
Index: compiler/goal_path.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/goal_path.m,v
retrieving revision 1.38
diff -U5 -r1.38 goal_path.m
--- compiler/goal_path.m	20 Aug 2006 08:21:07 -0000	1.38
+++ compiler/goal_path.m	27 Sep 2006 06:08:09 -0000
@@ -16,13 +16,15 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.goal_path.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 
 %-----------------------------------------------------------------------------%
@@ -56,16 +58,15 @@
 
 :- implementation.
 
 :- import_module check_hlds.type_util.
 :- import_module hlds.hlds_clauses.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_data.
 
-:- import_module char.
 :- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module pair.
 
Index: compiler/inst_check.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/inst_check.m,v
retrieving revision 1.4
diff -U5 -r1.4 inst_check.m
--- compiler/inst_check.m	22 Aug 2006 05:03:48 -0000	1.4
+++ compiler/inst_check.m	27 Sep 2006 06:08:09 -0000
@@ -22,10 +22,11 @@
 :- module check_hlds.inst_check.
 :- interface.
 
 :- import_module io.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
     % This predicate issues a warning for each user defined bound insts
     % that is not consistant with at least one type in scope.
     %
@@ -47,11 +48,10 @@
 
 :- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
-:- import_module libs.
 :- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
Index: compiler/inst_match.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/inst_match.m,v
retrieving revision 1.77
diff -U5 -r1.77 inst_match.m
--- compiler/inst_match.m	20 Aug 2006 08:21:11 -0000	1.77
+++ compiler/inst_match.m	27 Sep 2006 06:08:09 -0000
@@ -38,11 +38,13 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.inst_match.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module list.
 
 %-----------------------------------------------------------------------------%
@@ -301,12 +303,13 @@
 :- implementation.
 
 :- import_module check_hlds.inst_util.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.type_util.
-:- import_module hlds.hlds_data.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_type.
 
 :- import_module bool.
@@ -314,11 +317,10 @@
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module set.
 :- import_module set_tree234.
-:- import_module std_util.
 :- import_module svset.
 :- import_module term.
 
 %-----------------------------------------------------------------------------%
 
Index: compiler/inst_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/inst_util.m,v
retrieving revision 1.51
diff -U5 -r1.51 inst_util.m
--- compiler/inst_util.m	20 Aug 2006 08:21:12 -0000	1.51
+++ compiler/inst_util.m	27 Sep 2006 06:08:10 -0000
@@ -38,12 +38,14 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.inst_util.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.instmap.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 :- import_module maybe.
@@ -144,17 +146,18 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.det_analysis.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.type_util.
 :- import_module hlds.hlds_data.
-:- import_module mdbcomp.prim_data.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module mdbcomp.
+:- import_module mdbcomp.prim_data.
 :- import_module parse_tree.prog_mode.
 
 :- import_module int.
 :- import_module list.
 :- import_module map.
Index: compiler/interval.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/interval.m,v
retrieving revision 1.22
diff -U5 -r1.22 interval.m
--- compiler/interval.m	20 Sep 2006 09:42:06 -0000	1.22
+++ compiler/interval.m	27 Sep 2006 06:08:10 -0000
@@ -30,12 +30,14 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.interval.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module counter.
 :- import_module io.
@@ -174,30 +176,22 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module check_hlds.        % needed for type_util, mode_util
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.mode_util.
 :- import_module hlds.arg_info.
 :- import_module hlds.code_model.
 :- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_llds.
-:- import_module hlds.hlds_out.
 :- import_module hlds.instmap.
-:- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
-:- import_module libs.options.
 :- import_module ll_backend.
 :- import_module ll_backend.call_gen.
-:- import_module ll_backend.liveness.
-:- import_module ll_backend.live_vars.
-:- import_module ll_backend.store_alloc.
-:- import_module parse_tree.mercury_to_mercury.
-:- import_module parse_tree.prog_type.
 
 :- import_module assoc_list.
 :- import_module svmap.
 :- import_module svset.
 :- import_module svvarset.
Index: compiler/matching.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/matching.m,v
retrieving revision 1.10
diff -U5 -r1.10 matching.m
--- compiler/matching.m	31 Jul 2006 08:31:49 -0000	1.10
+++ compiler/matching.m	27 Sep 2006 06:08:10 -0000
@@ -17,10 +17,11 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.matching.
 :- interface.
 
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 :- import_module set.
@@ -85,10 +86,11 @@
 :- implementation.
 
 % Uncomment if you want to dump performance information into the .err file.
 % :- import_module unsafe.
 
+:- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module assoc_list.
 :- import_module int.
 :- import_module io.
Index: compiler/mcsolver.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mcsolver.m,v
retrieving revision 1.6
diff -U5 -r1.6 mcsolver.m
--- compiler/mcsolver.m	31 Jul 2006 08:31:49 -0000	1.6
+++ compiler/mcsolver.m	27 Sep 2006 06:08:10 -0000
@@ -117,20 +117,18 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module eqvclass.
-:- import_module exception.
-:- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module multi_map.
 :- import_module set.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
     % Assignment constraints.
     %
Index: compiler/mode_constraint_robdd.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_constraint_robdd.m,v
retrieving revision 1.10
diff -U5 -r1.10 mode_constraint_robdd.m
--- compiler/mode_constraint_robdd.m	31 Jul 2006 08:31:54 -0000	1.10
+++ compiler/mode_constraint_robdd.m	27 Sep 2006 06:08:10 -0000
@@ -21,11 +21,13 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.mode_constraint_robdd.
 :- interface.
 
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
 :- import_module mode_robdd.
 
 :- import_module bool.
@@ -144,24 +146,21 @@
 
 % :- import_module mode_robdd.tfeir.
 :- import_module mode_robdd.tfeirn.
 % :- import_module mode_robdd.check.
 
-:- import_module assoc_list.
 :- import_module bimap.
 :- import_module bool.
 :- import_module list.
 :- import_module map.
 :- import_module require.
 :- import_module robdd.
 :- import_module solutions.
 :- import_module sparse_bitset.
 :- import_module stack.
 :- import_module std_util.
-:- import_module string.
 :- import_module term.
-:- import_module term_io.
 :- import_module varset.
 
 :- type mc_type ---> mc_type.
 
 :- type mode_constraint_info --->
Index: compiler/mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_constraints.m,v
retrieving revision 1.34
diff -U5 -r1.34 mode_constraints.m
--- compiler/mode_constraints.m	5 Sep 2006 06:21:28 -0000	1.34
+++ compiler/mode_constraints.m	27 Sep 2006 06:08:11 -0000
@@ -19,10 +19,11 @@
 :- module check_hlds.mode_constraints.
 :- interface.
 
 :- import_module check_hlds.abstract_mode_constraints.
 :- import_module check_hlds.prop_mode_constraints.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
 :- import_module io.
 
 %-----------------------------------------------------------------------------%
@@ -41,45 +42,45 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module transform_hlds.    % for pd_cost, etc.
+
 :- import_module check_hlds.build_mode_constraints.
 :- import_module check_hlds.ordering_mode_constraints.
 
 :- import_module check_hlds.goal_path.
 :- import_module check_hlds.mode_constraint_robdd.
 :- import_module check_hlds.mode_ordering.
 :- import_module check_hlds.mode_util.
 :- import_module hlds.hhf.
 :- import_module hlds.hlds_clauses.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.inst_graph.
 :- import_module hlds.passes_aux.
 :- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module mode_robdd.
 % :- import_module mode_robdd.check.
 % :- import_module mode_robdd.tfeir.
 :- import_module mode_robdd.tfeirn.
+:- import_module parse_tree.
 :- import_module parse_tree.modules.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_io.
 :- import_module parse_tree.prog_mode.
 :- import_module transform_hlds.dependency_graph.
 
 :- import_module assoc_list.
-:- import_module bimap.
 :- import_module bool.
-:- import_module gc.
-:- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module multi_map.
 :- import_module pair.
@@ -87,11 +88,10 @@
 :- import_module set.
 :- import_module solutions.
 :- import_module sparse_bitset.
 :- import_module string.
 :- import_module term.
-:- import_module term_io.
 :- import_module varset.
 
 % :- import_module unsafe.
 
 %-----------------------------------------------------------------------------%
Index: compiler/mode_debug.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_debug.m,v
retrieving revision 1.27
diff -U5 -r1.27 mode_debug.m
--- compiler/mode_debug.m	31 Jul 2006 08:31:54 -0000	1.27
+++ compiler/mode_debug.m	27 Sep 2006 06:08:11 -0000
@@ -33,25 +33,20 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.modes.
-:- import_module hlds.hlds_goal.
-:- import_module hlds.hlds_module.
+:- import_module hlds.
 :- import_module hlds.instmap.
-:- import_module hlds.passes_aux.
-:- import_module libs.globals.
-:- import_module libs.options.
+:- import_module parse_tree.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_out.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module list.
-:- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module term.
 :- import_module varset.
 
Index: compiler/mode_errors.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_errors.m,v
retrieving revision 1.109
diff -U5 -r1.109 mode_errors.m
--- compiler/mode_errors.m	12 Sep 2006 04:41:40 -0000	1.109
+++ compiler/mode_errors.m	27 Sep 2006 06:08:11 -0000
@@ -14,14 +14,17 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.mode_errors.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_goal.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 :- import_module check_hlds.mode_info.
 
 :- import_module bool.
@@ -231,13 +234,13 @@
 
 :- implementation.
 
 :- import_module check_hlds.mode_info.
 :- import_module check_hlds.mode_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_out.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_mode.
@@ -248,11 +251,10 @@
 :- import_module int.
 :- import_module map.
 :- import_module maybe.
 :- import_module string.
 :- import_module term.
-:- import_module term_io.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
Index: compiler/mode_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_info.m,v
retrieving revision 1.91
diff -U5 -r1.91 mode_info.m
--- compiler/mode_info.m	20 Aug 2006 08:21:20 -0000	1.91
+++ compiler/mode_info.m	27 Sep 2006 06:08:11 -0000
@@ -17,17 +17,20 @@
 :- module check_hlds.mode_info.
 :- interface.
 
 :- import_module check_hlds.delay_info.
 :- import_module check_hlds.mode_errors.
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.pred_table.
 :- import_module hlds.instmap.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module assoc_list.
 :- import_module bag.
 :- import_module bool.
@@ -277,18 +280,17 @@
 
 :- implementation.
 
 :- import_module check_hlds.delay_info.
 :- import_module check_hlds.mode_errors.
-:- import_module check_hlds.mode_util.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 
 :- import_module int.
 :- import_module map.
-:- import_module queue.
 :- import_module string.
 :- import_module svbag.
 :- import_module term.
 :- import_module varset.
 
Index: compiler/mode_ordering.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_ordering.m,v
retrieving revision 1.17
diff -U5 -r1.17 mode_ordering.m
--- compiler/mode_ordering.m	20 Aug 2006 08:21:20 -0000	1.17
+++ compiler/mode_ordering.m	27 Sep 2006 06:08:11 -0000
@@ -13,10 +13,11 @@
 
 :- module check_hlds.mode_ordering.
 :- interface.
 
 :- import_module check_hlds.mode_constraint_robdd.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.inst_graph.
 
 :- import_module io.
@@ -52,11 +53,13 @@
 :- import_module hlds.hlds_goal.
 :- import_module mode_robdd.
 % :- import_module mode_robdd.check.
 % :- import_module mode_robdd.tfeir.
 :- import_module mode_robdd.tfeirn.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module assoc_list.
 :- import_module pair.
 :- import_module relation.
Index: compiler/mode_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_util.m,v
retrieving revision 1.192
diff -U5 -r1.192 mode_util.m
--- compiler/mode_util.m	20 Sep 2006 09:42:08 -0000	1.192
+++ compiler/mode_util.m	27 Sep 2006 06:08:11 -0000
@@ -14,14 +14,16 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.mode_util.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.instmap.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 
@@ -186,27 +188,24 @@
 
 :- implementation.
 
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.inst_util.
-:- import_module check_hlds.mode_info.
 :- import_module check_hlds.type_util.
 :- import_module hlds.hlds_data.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.prog_io.
 :- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
-:- import_module parse_tree.prog_util.
 
-:- import_module assoc_list.
 :- import_module int.
 :- import_module map.
 :- import_module pair.
 :- import_module set.
-:- import_module string.
 :- import_module term.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
Index: compiler/modecheck_call.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modecheck_call.m,v
retrieving revision 1.75
diff -U5 -r1.75 modecheck_call.m
--- compiler/modecheck_call.m	20 Sep 2006 09:42:09 -0000	1.75
+++ compiler/modecheck_call.m	27 Sep 2006 06:08:15 -0000
@@ -22,14 +22,17 @@
 :- module check_hlds.modecheck_call.
 :- interface.
 
 :- import_module check_hlds.mode_info.
 :- import_module check_hlds.modes.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module list.
 :- import_module maybe.
 
@@ -73,34 +76,29 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.clause_to_proc.
 :- import_module check_hlds.det_report.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.inst_util.
-:- import_module check_hlds.mode_debug.
 :- import_module check_hlds.mode_errors.
 :- import_module check_hlds.mode_info.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.modes.
-:- import_module check_hlds.type_util.
 :- import_module check_hlds.unify_proc.
-:- import_module hlds.hlds_data.
 :- import_module hlds.instmap.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_type.
 
 :- import_module bool.
-:- import_module int.
 :- import_module map.
 :- import_module set.
 :- import_module term.
-:- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 modecheck_call_pred(PredId, DeterminismKnown, ProcId0, TheProcId,
         ArgVars0, ArgVars, _GoalInfo, ExtraGoals, !ModeInfo) :-
Index: compiler/modecheck_unify.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modecheck_unify.m,v
retrieving revision 1.111
diff -U5 -r1.111 modecheck_unify.m
--- compiler/modecheck_unify.m	20 Sep 2006 09:42:09 -0000	1.111
+++ compiler/modecheck_unify.m	27 Sep 2006 06:08:15 -0000
@@ -20,10 +20,11 @@
 
 :- module check_hlds.modecheck_unify.
 :- interface.
 
 :- import_module check_hlds.mode_info.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module parse_tree.prog_data.
 
 :- import_module io.
 
@@ -44,42 +45,35 @@
 
 :- implementation.
 
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.inst_util.
-:- import_module check_hlds.modecheck_call.
 :- import_module check_hlds.mode_debug.
 :- import_module check_hlds.mode_errors.
 :- import_module check_hlds.mode_info.
 :- import_module check_hlds.modes.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.polymorphism.
-:- import_module check_hlds.typecheck.
 :- import_module check_hlds.type_util.
 :- import_module check_hlds.unify_proc.
 :- import_module check_hlds.unique_modes.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.instmap.
-:- import_module hlds.make_hlds.
-:- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.module_qual.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
-:- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
 :- import_module bool.
-:- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module set.
Index: compiler/modes.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modes.m,v
retrieving revision 1.345
diff -U5 -r1.345 modes.m
--- compiler/modes.m	20 Sep 2006 09:42:09 -0000	1.345
+++ compiler/modes.m	27 Sep 2006 06:08:15 -0000
@@ -127,14 +127,16 @@
 
 :- module check_hlds.modes.
 :- interface.
 
 :- import_module check_hlds.mode_info.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.instmap.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
@@ -363,30 +365,26 @@
 :- import_module check_hlds.mode_errors.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.modecheck_call.
 :- import_module check_hlds.modecheck_unify.
 :- import_module check_hlds.polymorphism.
-:- import_module check_hlds.purity.
 :- import_module check_hlds.type_util.
-:- import_module check_hlds.typecheck.
 :- import_module check_hlds.unify_proc.
 :- import_module check_hlds.unique_modes.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
-:- import_module hlds.make_hlds.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
 :- import_module hlds.quantification.
 :- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.error_util.
-:- import_module parse_tree.mercury_to_mercury.
-:- import_module parse_tree.module_qual.
 :- import_module parse_tree.prog_event.
 :- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 
Index: compiler/name_mangle.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/name_mangle.m,v
retrieving revision 1.21
diff -U5 -r1.21 name_mangle.m
--- compiler/name_mangle.m	20 Sep 2006 09:42:10 -0000	1.21
+++ compiler/name_mangle.m	27 Sep 2006 06:08:16 -0000
@@ -25,15 +25,15 @@
 
 :- module backend_libs.name_mangle.
 :- interface.
 
 :- import_module backend_libs.rtti.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 
 :- import_module bool.
 :- import_module io.
-:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
     % Output a proc label, with the usual mercury_label_prefix prefix.
     %
@@ -101,20 +101,19 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module hlds.hlds_pred.
+:- import_module hlds.
 :- import_module hlds.special_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_foreign.
-:- import_module parse_tree.prog_util.
 
-:- import_module char.
 :- import_module int.
 :- import_module list.
-:- import_module pair.
+:- import_module string.
 
 %-----------------------------------------------------------------------------%
 
 output_proc_label(ProcLabel, !IO) :-
     output_proc_label_maybe_prefix(ProcLabel, yes, !IO).
Index: compiler/ordering_mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ordering_mode_constraints.m,v
retrieving revision 1.10
diff -U5 -r1.10 ordering_mode_constraints.m
--- compiler/ordering_mode_constraints.m	20 Sep 2006 09:42:10 -0000	1.10
+++ compiler/ordering_mode_constraints.m	27 Sep 2006 06:08:16 -0000
@@ -18,14 +18,14 @@
 :- module check_hlds.ordering_mode_constraints.
 :- interface.
 
 :- import_module check_hlds.build_mode_constraints.
 :- import_module check_hlds.prop_mode_constraints.
+:- import_module hlds.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_module.
 
-:- import_module int.
 :- import_module io.
 :- import_module list.
 :- import_module set.
 
 %-----------------------------------------------------------------------------%
@@ -104,18 +104,19 @@
 :- import_module check_hlds.clause_to_proc.
 :- import_module check_hlds.mcsolver.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
-:- import_module hlds.goal_util.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 
 :- import_module bimap.
 :- import_module bool.
+:- import_module int.
 :- import_module multi_map.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module string.
Index: compiler/polymorphism.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/polymorphism.m,v
retrieving revision 1.307
diff -U5 -r1.307 polymorphism.m
--- compiler/polymorphism.m	20 Sep 2006 09:42:11 -0000	1.307
+++ compiler/polymorphism.m	27 Sep 2006 06:08:19 -0000
@@ -172,15 +172,18 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.polymorphism.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module io.
 :- import_module list.
 :- import_module maybe.
@@ -372,46 +375,38 @@
 
 :- implementation.
 
 :- import_module check_hlds.clause_to_proc.
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.purity.
-:- import_module check_hlds.typecheck.
 :- import_module check_hlds.type_util.
-:- import_module check_hlds.unify_proc.
 :- import_module hlds.goal_util.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_code_util.
 :- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
 :- import_module hlds.instmap.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
 :- import_module hlds.quantification.
 :- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 :- import_module mdbcomp.prim_data.
 :- import_module mdbcomp.program_representation.
-:- import_module parse_tree.prog_io.
 :- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 :- import_module parse_tree.prog_util.
 
-:- import_module assoc_list.
 :- import_module bool.
 :- import_module int.
 :- import_module map.
 :- import_module pair.
 :- import_module set.
 :- import_module string.
-:- import_module svmap.
-:- import_module svvarset.
 :- import_module term.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 %
Index: compiler/post_typecheck.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/post_typecheck.m,v
retrieving revision 1.109
diff -U5 -r1.109 post_typecheck.m
--- compiler/post_typecheck.m	20 Sep 2006 09:42:12 -0000	1.109
+++ compiler/post_typecheck.m	27 Sep 2006 06:08:19 -0000
@@ -34,14 +34,17 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.post_typecheck.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
@@ -107,26 +110,23 @@
 
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.modecheck_call.
 :- import_module check_hlds.mode_errors.
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.typecheck.
 :- import_module check_hlds.type_util.
 :- import_module hlds.assertion.
 :- import_module hlds.goal_util.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_out.
 :- import_module hlds.pred_table.
-:- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 :- import_module parse_tree.mercury_to_mercury.
-:- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
Index: compiler/proc_label.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/proc_label.m,v
retrieving revision 1.21
diff -U5 -r1.21 proc_label.m
--- compiler/proc_label.m	22 Aug 2006 05:04:03 -0000	1.21
+++ compiler/proc_label.m	27 Sep 2006 06:08:19 -0000
@@ -17,14 +17,17 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.proc_label.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 
     % Return the id of the procedure specified by the rtti_proc_label.
@@ -55,15 +58,13 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module backend_libs.rtti.
-:- import_module check_hlds.type_util.
-:- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_type.
-:- import_module parse_tree.prog_util.
 
 :- import_module list.
 :- import_module pair.
 :- import_module string.
 
Index: compiler/prop_mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/prop_mode_constraints.m,v
retrieving revision 1.13
diff -U5 -r1.13 prop_mode_constraints.m
--- compiler/prop_mode_constraints.m	20 Aug 2006 08:21:27 -0000	1.13
+++ compiler/prop_mode_constraints.m	27 Sep 2006 06:08:19 -0000
@@ -20,10 +20,11 @@
 :- module check_hlds.prop_mode_constraints.
 :- interface.
 
 :- import_module check_hlds.abstract_mode_constraints.
 :- import_module check_hlds.build_mode_constraints.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 
 :- import_module io.
 :- import_module list.
@@ -74,46 +75,27 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.goal_path.
-:- import_module check_hlds.mcsolver.
-:- import_module check_hlds.mode_constraint_robdd.
-:- import_module check_hlds.mode_ordering.
-:- import_module check_hlds.mode_util.
-:- import_module hlds.hhf.
 :- import_module hlds.hlds_clauses.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
-:- import_module hlds.inst_graph.
-:- import_module hlds.passes_aux.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
-:- import_module libs.options.
-:- import_module mode_robdd.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_mode.
-:- import_module parse_tree.modules.
-:- import_module transform_hlds.dependency_graph.
 
-:- import_module assoc_list.
-:- import_module bimap.
 :- import_module bool.
-:- import_module int.
-:- import_module multi_map.
 :- import_module pair.
-:- import_module robdd.
 :- import_module set.
-:- import_module sparse_bitset.
 :- import_module string.
 :- import_module svmap.
 :- import_module svset.
 :- import_module svvarset.
 :- import_module term.
-:- import_module term_io.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 process_scc(SCC0, !ModuleInfo, !VarInfo, !Constraints) :-
Index: compiler/pseudo_type_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/pseudo_type_info.m,v
retrieving revision 1.27
diff -U5 -r1.27 pseudo_type_info.m
--- compiler/pseudo_type_info.m	20 Sep 2006 09:42:13 -0000	1.27
+++ compiler/pseudo_type_info.m	27 Sep 2006 06:08:19 -0000
@@ -19,10 +19,11 @@
 
 :- module backend_libs.pseudo_type_info.
 :- interface.
 
 :- import_module backend_libs.rtti.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
     % construct_pseudo_type_info(Type, NumUnivQTvars, ExistQVars,
     %   PseudoTypeInfo):
     %
@@ -60,19 +61,19 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.type_util.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 
 :- import_module int.
 :- import_module list.
-:- import_module pair.
 :- import_module term.
 
 %---------------------------------------------------------------------------%
 
 construct_maybe_pseudo_type_info(Type, NumUnivQTvars, ExistQTvars,
Index: compiler/purity.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/purity.m,v
retrieving revision 1.104
diff -U5 -r1.104 purity.m
--- compiler/purity.m	20 Sep 2006 09:42:13 -0000	1.104
+++ compiler/purity.m	27 Sep 2006 06:08:20 -0000
@@ -118,12 +118,14 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.purity.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
@@ -160,46 +162,32 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.clause_to_proc.
-:- import_module check_hlds.inst_util.
-:- import_module check_hlds.mode_util.
 :- import_module check_hlds.post_typecheck.
-:- import_module check_hlds.typecheck.
-:- import_module check_hlds.type_util.
-:- import_module check_hlds.unify_proc.
 :- import_module hlds.hlds_clauses.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
-:- import_module hlds.hlds_out.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.mercury_to_mercury.
-:- import_module parse_tree.module_qual.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_io_util.
 :- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
-:- import_module parse_tree.prog_util.
 
-:- import_module assoc_list.
 :- import_module bool.
 :- import_module int.
-:- import_module io.
 :- import_module list.
 :- import_module map.
-:- import_module maybe.
 :- import_module pair.
-:- import_module set.
 :- import_module string.
 :- import_module term.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
Index: compiler/rtti.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rtti.m,v
retrieving revision 1.74
diff -U5 -r1.74 rtti.m
--- compiler/rtti.m	22 Aug 2006 05:04:06 -0000	1.74
+++ compiler/rtti.m	27 Sep 2006 06:08:20 -0000
@@ -24,15 +24,18 @@
 %-----------------------------------------------------------------------------%
 
 :- module backend_libs.rtti.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 :- import_module set.
@@ -920,20 +923,17 @@
 %----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module backend_libs.name_mangle.
-:- import_module backend_libs.proc_label.
-:- import_module backend_libs.pseudo_type_info.
+:- import_module check_hlds.        % needed for type_util, mode_util
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_data.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_foreign.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
-:- import_module parse_tree.prog_util. % for mercury_public_builtin_module
 
 :- import_module int.
 :- import_module pair.
 :- import_module string.
 :- import_module varset.
Index: compiler/simplify.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/simplify.m,v
retrieving revision 1.189
diff -U5 -r1.189 simplify.m
--- compiler/simplify.m	20 Sep 2006 09:42:13 -0000	1.189
+++ compiler/simplify.m	27 Sep 2006 06:08:21 -0000
@@ -32,15 +32,17 @@
 :- interface.
 
 :- import_module check_hlds.common.
 :- import_module check_hlds.det_report.
 :- import_module check_hlds.det_util.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.instmap.
+:- import_module libs.
 :- import_module libs.globals.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
@@ -118,34 +120,34 @@
 :- implementation.
 
 :- import_module check_hlds.det_analysis.
 :- import_module check_hlds.format_call.
 :- import_module check_hlds.inst_match.
-:- import_module check_hlds.modes.
 :- import_module check_hlds.mode_util.
 :- import_module check_hlds.polymorphism.
-:- import_module check_hlds.purity.
 :- import_module check_hlds.type_util.
 :- import_module check_hlds.unify_proc.
 :- import_module hlds.goal_form.
 :- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
 :- import_module hlds.quantification.
 :- import_module hlds.special_pred.
 :- import_module libs.compiler_util.
 :- import_module libs.options.
 :- import_module libs.trace_params.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_mode.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 :- import_module parse_tree.prog_util.
+:- import_module transform_hlds.    % for pd_cost, etc.
 :- import_module transform_hlds.const_prop.
 :- import_module transform_hlds.pd_cost.
 
 :- import_module int.
 :- import_module map.
Index: compiler/stratify.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/stratify.m,v
retrieving revision 1.56
diff -U5 -r1.56 stratify.m
--- compiler/stratify.m	20 Sep 2006 09:42:14 -0000	1.56
+++ compiler/stratify.m	27 Sep 2006 06:08:23 -0000
@@ -29,10 +29,11 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.stratify.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
 :- import_module io.
 
     % Perform stratification analysis, for the given module. If the
@@ -47,25 +48,25 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.type_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
-:- import_module hlds.passes_aux.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
+:- import_module transform_hlds.    % for pd_cost, etc.
 :- import_module transform_hlds.dependency_graph.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module list.
Index: compiler/switch_detection.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/switch_detection.m,v
retrieving revision 1.129
diff -U5 -r1.129 switch_detection.m
--- compiler/switch_detection.m	22 Aug 2006 05:04:09 -0000	1.129
+++ compiler/switch_detection.m	27 Sep 2006 06:08:23 -0000
@@ -16,13 +16,15 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.switch_detection.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
@@ -60,21 +62,20 @@
 
 :- import_module check_hlds.det_util.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.type_util.
 :- import_module hlds.goal_util.
-:- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.instmap.
 :- import_module hlds.passes_aux.
 :- import_module hlds.quantification.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_mode.
 
 :- import_module assoc_list.
-:- import_module char.
 :- import_module int.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module set.
Index: compiler/switch_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/switch_util.m,v
retrieving revision 1.34
diff -U5 -r1.34 switch_util.m
--- compiler/switch_util.m	22 Aug 2006 05:04:09 -0000	1.34
+++ compiler/switch_util.m	27 Sep 2006 06:08:23 -0000
@@ -16,13 +16,15 @@
 
 :- module backend_libs.switch_util.
 :- interface.
 
 :- import_module backend_libs.rtti.         % for sectag_locn
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_type.
 
 :- import_module assoc_list.
 :- import_module list.
@@ -147,10 +149,11 @@
 
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module parse_tree.prog_type.
 
 :- import_module char.
 :- import_module int.
Index: compiler/type_class_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/type_class_info.m,v
retrieving revision 1.21
diff -U5 -r1.21 type_class_info.m
--- compiler/type_class_info.m	22 Aug 2006 05:04:11 -0000	1.21
+++ compiler/type_class_info.m	27 Sep 2006 06:08:23 -0000
@@ -21,11 +21,13 @@
 
 :- module backend_libs.type_class_info.
 :- interface.
 
 :- import_module backend_libs.rtti.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module list.
 
@@ -41,30 +43,22 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module backend_libs.base_typeclass_info.
 :- import_module backend_libs.pseudo_type_info.
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
-:- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.prog_io.
-:- import_module parse_tree.prog_out.
 
-:- import_module assoc_list.
-:- import_module int.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
-:- import_module string.
 :- import_module term.
 :- import_module varset.
 
 %---------------------------------------------------------------------------%
 
Index: compiler/type_ctor_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/type_ctor_info.m,v
retrieving revision 1.83
diff -U5 -r1.83 type_ctor_info.m
--- compiler/type_ctor_info.m	20 Sep 2006 09:42:15 -0000	1.83
+++ compiler/type_ctor_info.m	27 Sep 2006 06:08:23 -0000
@@ -35,10 +35,11 @@
 
 :- module backend_libs.type_ctor_info.
 :- interface.
 
 :- import_module backend_libs.rtti.
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
 :- import_module list.
 
 %---------------------------------------------------------------------------%
@@ -61,30 +62,30 @@
 %---------------------------------------------------------------------------%
 %---------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module backend_libs.builtin_ops.
 :- import_module backend_libs.foreign.
 :- import_module backend_libs.pseudo_type_info.
 :- import_module backend_libs.rtti.
 :- import_module backend_libs.type_class_info.
+:- import_module check_hlds.        % needed for type_util, mode_util
 :- import_module check_hlds.type_util.
 :- import_module hlds.hlds_code_util.
 :- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
-:- import_module hlds.make_tags.
 :- import_module hlds.pred_table.
 :- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
 :- import_module bool.
Index: compiler/type_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/type_util.m,v
retrieving revision 1.170
diff -U5 -r1.170 type_util.m
--- compiler/type_util.m	20 Sep 2006 09:42:15 -0000	1.170
+++ compiler/type_util.m	27 Sep 2006 06:08:23 -0000
@@ -16,13 +16,16 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.type_util.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_type.
 
 :- import_module list.
 :- import_module maybe.
@@ -296,31 +299,24 @@
 
 :- implementation.
 
 :- import_module backend_libs.
 :- import_module backend_libs.foreign.
-:- import_module check_hlds.purity.
-:- import_module hlds.hlds_out.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
-:- import_module parse_tree.prog_io.
-:- import_module parse_tree.prog_io_goal.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_util.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 
 :- import_module assoc_list.
 :- import_module bool.
 :- import_module char.
 :- import_module int.
 :- import_module map.
 :- import_module pair.
-:- import_module string.
-:- import_module svmap.
-:- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 type_ctor_module(_ModuleInfo, type_ctor(TypeSymName, _Arity)) = ModuleName :-
     sym_name_get_module_name(TypeSymName, unqualified(""), ModuleName).
Index: compiler/typecheck.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/typecheck.m,v
retrieving revision 1.405
diff -U5 -r1.405 typecheck.m
--- compiler/typecheck.m	20 Sep 2006 09:42:16 -0000	1.405
+++ compiler/typecheck.m	27 Sep 2006 06:08:24 -0000
@@ -77,11 +77,13 @@
 
 :- module check_hlds.typecheck.
 
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 
 :- import_module bool.
 :- import_module list.
 
@@ -99,56 +101,48 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.clause_to_proc.
 :- import_module check_hlds.goal_path.
-:- import_module check_hlds.inst_match.
 :- import_module check_hlds.type_util.
 :- import_module check_hlds.typecheck_errors.
 :- import_module check_hlds.typecheck_info.
 :- import_module check_hlds.typeclasses.
 :- import_module hlds.goal_util.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
-:- import_module hlds.hlds_out.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.passes_aux.
 :- import_module hlds.pred_table.
 :- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.modules.
 :- import_module parse_tree.prog_data.
 :- import_module parse_tree.prog_event.
-:- import_module parse_tree.prog_io.
-:- import_module parse_tree.prog_io_util.
-:- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
 :- import_module parse_tree.prog_util.
 
 :- import_module assoc_list.
-:- import_module getopt_io.
 :- import_module int.
 :- import_module map.
 :- import_module maybe.
-:- import_module multi_map.
 :- import_module pair.
 :- import_module set.
 :- import_module std_util.
 :- import_module string.
 :- import_module term.
-:- import_module term_io.
 :- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 typecheck_module(!ModuleInfo, Specs, ExceededIterationLimit) :-
Index: compiler/typecheck_errors.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/typecheck_errors.m,v
retrieving revision 1.30
diff -U5 -r1.30 typecheck_errors.m
--- compiler/typecheck_errors.m	12 Sep 2006 04:41:43 -0000	1.30
+++ compiler/typecheck_errors.m	27 Sep 2006 06:08:25 -0000
@@ -15,14 +15,17 @@
 
 :- module check_hlds.typecheck_errors.
 :- interface.
 
 :- import_module check_hlds.typecheck_info.
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 
 :- import_module list.
 
@@ -82,17 +85,16 @@
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
-:- import_module check_hlds.type_util.
 :- import_module hlds.hlds_error_util.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_out.
 :- import_module hlds.pred_table.
+:- import_module libs.
 :- import_module libs.compiler_util.
-:- import_module libs.globals.
 :- import_module libs.options.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.modules.
 :- import_module parse_tree.prog_io_util.
 :- import_module parse_tree.prog_mode.
Index: compiler/typecheck_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/typecheck_info.m,v
retrieving revision 1.17
diff -U5 -r1.17 typecheck_info.m
--- compiler/typecheck_info.m	20 Sep 2006 09:42:16 -0000	1.17
+++ compiler/typecheck_info.m	27 Sep 2006 06:08:25 -0000
@@ -15,16 +15,19 @@
 %-----------------------------------------------------------------------------%
 
 :- module check_hlds.typecheck_info.
 :- interface.
 
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.pred_table.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module io.
@@ -352,22 +355,20 @@
 %-----------------------------------------------------------------------------%
 
 :- implementation.
 
 :- import_module check_hlds.type_util.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
 :- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_type_subst.
-:- import_module parse_tree.prog_util.
 
 :- import_module int.
-:- import_module pair.
-:- import_module set.
 :- import_module string.
 :- import_module svmap.
 :- import_module term.
 :- import_module varset.
 
Index: compiler/typeclasses.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/typeclasses.m,v
retrieving revision 1.15
diff -U5 -r1.15 typeclasses.m
--- compiler/typeclasses.m	20 Sep 2006 09:42:16 -0000	1.15
+++ compiler/typeclasses.m	27 Sep 2006 06:08:27 -0000
@@ -16,12 +16,14 @@
 
 :- module check_hlds.typeclasses.
 :- interface.
 
 :- import_module check_hlds.typecheck_info.
+:- import_module hlds.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
     % perform_context_reduction(OrigTypeAssignSet, !Info) is true
     % iff either
     % (a) !:Info is the typecheck_info that results from performing
Index: compiler/unify_proc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/unify_proc.m,v
retrieving revision 1.173
diff -U5 -r1.173 unify_proc.m
--- compiler/unify_proc.m	20 Sep 2006 09:42:17 -0000	1.173
+++ compiler/unify_proc.m	27 Sep 2006 06:08:27 -0000
@@ -46,17 +46,20 @@
 
 :- module check_hlds.unify_proc.
 :- interface.
 
 :- import_module check_hlds.mode_info.
+:- import_module hlds.
 :- import_module hlds.hlds_clauses.
 :- import_module hlds.hlds_data.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
 :- import_module hlds.pred_table.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module io.
 :- import_module list.
@@ -138,11 +141,10 @@
 :- import_module check_hlds.clause_to_proc.
 :- import_module check_hlds.cse_detection.
 :- import_module check_hlds.det_analysis.
 :- import_module check_hlds.inst_match.
 :- import_module check_hlds.modes.
-:- import_module check_hlds.mode_util.
 :- import_module check_hlds.polymorphism.
 :- import_module check_hlds.post_typecheck.
 :- import_module check_hlds.switch_detection.
 :- import_module check_hlds.type_util.
 :- import_module check_hlds.unique_modes.
@@ -151,18 +153,16 @@
 :- import_module hlds.instmap.
 :- import_module hlds.make_hlds.
 :- import_module hlds.quantification.
 :- import_module hlds.hlds_rtti.
 :- import_module hlds.special_pred.
+:- import_module libs.
 :- import_module libs.compiler_util.
 :- import_module libs.globals.
 :- import_module libs.options.
-:- import_module libs.tree.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 :- import_module parse_tree.prog_type.
 :- import_module parse_tree.prog_util.
 :- import_module recompilation.
 
 :- import_module assoc_list.
Index: compiler/unique_modes.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/unique_modes.m,v
retrieving revision 1.116
diff -U5 -r1.116 unique_modes.m
--- compiler/unique_modes.m	5 Sep 2006 06:21:33 -0000	1.116
+++ compiler/unique_modes.m	27 Sep 2006 06:08:27 -0000
@@ -33,13 +33,15 @@
 
 :- module check_hlds.unique_modes.
 :- interface.
 
 :- import_module check_hlds.mode_info.
+:- import_module hlds.
 :- import_module hlds.hlds_goal.
 :- import_module hlds.hlds_module.
 :- import_module hlds.hlds_pred.
+:- import_module parse_tree.
 :- import_module parse_tree.prog_data.
 
 :- import_module bool.
 :- import_module io.
 :- import_module set.
@@ -82,31 +84,25 @@
 :- import_module check_hlds.modecheck_unify.
 :- import_module check_hlds.mode_debug.
 :- import_module check_hlds.mode_errors.
 :- import_module check_hlds.modes.
 :- import_module check_hlds.mode_util.
-:- import_module check_hlds.unify_proc.
-:- import_module hlds.hlds_data.
-:- import_module hlds.hlds_out.
 :- import_module hlds.instmap.
-:- import_module hlds.passes_aux.
+:- import_module libs.
 :- import_module libs.compiler_util.
+:- import_module mdbcomp.
 :- import_module mdbcomp.prim_data.
-:- import_module parse_tree.mercury_to_mercury.
 :- import_module parse_tree.prog_mode.
-:- import_module parse_tree.prog_out.
 
-:- import_module assoc_list.
 :- import_module bag.
 :- import_module int.
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
 :- import_module string.
 :- import_module term.
-:- import_module varset.
 
 %-----------------------------------------------------------------------------%
 
 check_module(!ModuleInfo, !IO) :-
     check_pred_modes(check_unique_modes, may_change_called_proc, !ModuleInfo,
Index: compiler/unused_imports.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/unused_imports.m,v
retrieving revision 1.2
diff -U5 -r1.2 unused_imports.m
--- compiler/unused_imports.m	25 Sep 2006 18:31:33 -0000	1.2
+++ compiler/unused_imports.m	27 Sep 2006 06:08:27 -0000
@@ -21,10 +21,11 @@
 :- module check_hlds.unused_imports.
 :- interface.
 
 :- import_module io.
 
+:- import_module hlds.
 :- import_module hlds.hlds_module.
 
     % This predicate issues a warning for each import_module
     % which is not directly used in this module, plus those
     % which are in the interface but should be in the implementation.
@@ -48,24 +49,21 @@
 
 :- import_module parse_tree.
 :- import_module parse_tree.error_util.
 :- import_module parse_tree.modules.
 :- import_module parse_tree.prog_data.
-:- import_module parse_tree.prog_type.
 
 :- import_module libs.
 :- import_module libs.compiler_util.
 
 :- import_module bool.
 :- import_module list.
 :- import_module map.
 :- import_module maybe.
 :- import_module pair.
-:- import_module relation.
 :- import_module set.
 :- import_module string.
-:- import_module svset.
 :- import_module term.
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------