[m-rev.] for post-commit review: better determinism error messages
Zoltan Somogyi
zs at cs.mu.OZ.AU
Fri Oct 28 12:08:56 AEST 2005
For post-commit review. While the diff is very large, only the parts involving
the named files below are worth reviewing; the *.m part was done by
automatic substitution.
Zoltan.
Improve the error messages generated for determinism errors involving committed
choice contexts. Previously, we printed a message to the effect that e.g.
a cc pred is called in context that requires all solutions, but we didn't say
*why* the context requires all solutions. We now keep track of all the goals
to the right that could fail, since it is these goals that may reject the first
solution of a committed choice goal.
The motivation for this diff was the fact that I found that locating the
failing goal can be very difficult if the conjunction to the right is
a couple of hundred lines long. This would have been a nontrivial problem,
since (a) unifications involving values of user-defined types are committed
choice goals, and (b) we can expect uses of user-defined types to increase.
compiler/det_analysis.m:
Keep track of goals to the right of the current goal that could fail,
and include them in the error representation if required.
compiler/det_report.m:
Include the list of failing goals to the right in the representations
of determinism errors involving committed committed choice goals.
Convert the last part of this module that wasn't using error_util
to use error_util. Make most parts of this module just construct
error message specifications; print those specifications (using
error_util) in only a few places.
compiler/hlds_out.m:
Add a function for use by the new code in det_report.m.
compiler/error_util.m:
Add a function for use by the new code in det_report.m.
compiler/error_util.m:
compiler/compiler_util.m:
Error_util is still changing reasonably often, and yet it is
included in lots of modules, most of which need only a few simple
non-parse-tree-related predicates from it (e.g. unexpected).
Move those predicates to a new module, compiler_util.m. This also
eliminates some undesirable dependencies from libs to parse_tree.
compiler/libs.m:
Include compiler_util.m.
compiler/notes/compiler_design.html:
Document compiler_util.m, and fix the documentation of some other
modules.
compiler/*.m:
Import compiler_util instead of or in addition to error_util.
To make this easier, consistently use . instead of __ for module
qualifying module names.
tests/invalid/det_errors_cc.{m,err_exp}:
Add this new test case to test the error messages for cc contexts.
tests/invalid/det_errors_deet.{m,err_exp}:
Add this new test case to test the error messages for unifications
inside function symbols.
tests/invalid/Mmakefile:
Add the new test cases.
tests/invalid/det_errors.err_exp:
tests/invalid/magicbox.err_exp:
Change the expected output to conform to the change in det_report.m,
which is now more consistent.
cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/accumulator.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/accumulator.m,v
retrieving revision 1.44
diff -u -b -r1.44 accumulator.m
--- compiler/accumulator.m 24 Oct 2005 04:13:53 -0000 1.44
+++ compiler/accumulator.m 27 Oct 2005 14:31:18 -0000
@@ -144,8 +144,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -158,23 +158,24 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module hlds__assertion.
-:- import_module hlds__goal_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__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__goal_store.
+:- import_module check_hlds.inst_match.
+:- import_module hlds.assertion.
+:- import_module hlds.goal_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.instmap.
+:- import_module hlds.quantification.
+:- 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.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.goal_store.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/add_aditi.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_aditi.m,v
retrieving revision 1.4
diff -u -b -r1.4 add_aditi.m
--- compiler/add_aditi.m 24 Oct 2005 04:13:53 -0000 1.4
+++ compiler/add_aditi.m 27 Oct 2005 14:31:18 -0000
@@ -9,13 +9,13 @@
:- module hlds__make_hlds__add_aditi.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_hlds__state_var.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_hlds.state_var.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -52,19 +52,19 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__make_hlds__add_clause.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_hlds__superhomogeneous.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.make_hlds.add_clause.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_hlds.superhomogeneous.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/add_class.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_class.m,v
retrieving revision 1.6
diff -u -b -r1.6 add_class.m
--- compiler/add_class.m 24 Oct 2005 04:13:53 -0000 1.6
+++ compiler/add_class.m 27 Oct 2005 14:31:18 -0000
@@ -9,12 +9,12 @@
:- module hlds__make_hlds__add_class.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -42,20 +42,21 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__make_hlds__add_clause.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__make_hlds__add_type.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module hlds__make_hlds__make_hlds_warn.
-:- import_module hlds__make_hlds__state_var.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.clause_to_proc.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.make_hlds.add_clause.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.make_hlds.add_type.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module hlds.make_hlds.make_hlds_warn.
+:- import_module hlds.make_hlds.state_var.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/add_clause.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_clause.m,v
retrieving revision 1.11
diff -u -b -r1.11 add_clause.m
--- compiler/add_clause.m 24 Oct 2005 04:13:54 -0000 1.11
+++ compiler/add_clause.m 27 Oct 2005 14:31:18 -0000
@@ -9,14 +9,14 @@
:- module hlds__make_hlds__add_clause.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_hlds__state_var.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_hlds.state_var.
+:- import_module hlds.quantification.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -51,26 +51,27 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__add_aditi.
-:- import_module hlds__make_hlds__add_pragma.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__make_hlds__field_access.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module hlds__make_hlds__make_hlds_warn.
-:- import_module hlds__make_hlds__superhomogeneous.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.clause_to_proc.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.add_aditi.
+:- import_module hlds.make_hlds.add_pragma.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.make_hlds.field_access.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module hlds.make_hlds.make_hlds_warn.
+:- import_module hlds.make_hlds.superhomogeneous.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/add_heap_ops.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_heap_ops.m,v
retrieving revision 1.19
diff -u -b -r1.19 add_heap_ops.m
--- compiler/add_heap_ops.m 24 Oct 2005 04:13:54 -0000 1.19
+++ compiler/add_heap_ops.m 27 Oct 2005 14:31:18 -0000
@@ -32,8 +32,8 @@
:- module ml_backend__add_heap_ops.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- pred add_heap_ops(module_info::in, proc_info::in, proc_info::out) is det.
@@ -41,19 +41,19 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_form.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_form.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/add_mode.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_mode.m,v
retrieving revision 1.5
diff -u -b -r1.5 add_mode.m
--- compiler/add_mode.m 24 Oct 2005 04:13:54 -0000 1.5
+++ compiler/add_mode.m 27 Oct 2005 14:31:18 -0000
@@ -11,10 +11,10 @@
:- module hlds__make_hlds__add_mode.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -30,11 +30,11 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_mode.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_mode.
:- import_module map.
:- import_module require.
Index: compiler/add_pragma.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_pragma.m,v
retrieving revision 1.14
diff -u -b -r1.14 add_pragma.m
--- compiler/add_pragma.m 24 Oct 2005 04:13:54 -0000 1.14
+++ compiler/add_pragma.m 27 Oct 2005 14:31:18 -0000
@@ -9,13 +9,13 @@
:- module hlds__make_hlds__add_pragma.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__mercury_to_mercury.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.mercury_to_mercury.
:- import_module assoc_list.
:- import_module io.
@@ -106,34 +106,35 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__foreign.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__make_hlds__add_aditi.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__make_hlds_warn.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_tags.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module backend_libs.foreign.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.make_hlds.add_aditi.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.make_hlds_warn.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_tags.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module ll_backend.
-:- import_module ll_backend__fact_table.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module ll_backend.fact_table.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module recompilation.
-:- import_module transform_hlds__term_constr_main.
-:- import_module transform_hlds__term_constr_util.
-:- import_module transform_hlds__term_util.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_constr_util.
+:- import_module transform_hlds.term_util.
:- import_module bag.
:- import_module bool.
Index: compiler/add_pred.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_pred.m,v
retrieving revision 1.8
diff -u -b -r1.8 add_pred.m
--- compiler/add_pred.m 24 Oct 2005 04:13:54 -0000 1.8
+++ compiler/add_pred.m 27 Oct 2005 14:31:18 -0000
@@ -12,11 +12,11 @@
:- module hlds__make_hlds__add_pred.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -60,18 +60,19 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_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 hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_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 map.
:- import_module require.
Index: compiler/add_solver.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_solver.m,v
retrieving revision 1.5
diff -u -b -r1.5 add_solver.m
--- compiler/add_solver.m 24 Oct 2005 04:13:54 -0000 1.5
+++ compiler/add_solver.m 27 Oct 2005 14:31:18 -0000
@@ -9,12 +9,12 @@
:- module hlds__make_hlds__add_solver.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -51,11 +51,11 @@
:- implementation.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module libs__globals.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module libs.globals.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module map.
Index: compiler/add_special_pred.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_special_pred.m,v
retrieving revision 1.5
diff -u -b -r1.5 add_special_pred.m
--- compiler/add_special_pred.m 24 Oct 2005 04:13:54 -0000 1.5
+++ compiler/add_special_pred.m 27 Oct 2005 14:31:18 -0000
@@ -13,11 +13,11 @@
:- module hlds__make_hlds__add_special_pred.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
% do_add_special_pred_for_real(SpecialPredId, TVarSet, Type, TypeCtor,
% TypeBody, TypeContext, TypeStatus, !ModuleInfo).
@@ -50,14 +50,14 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__unify_proc.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module check_hlds.unify_proc.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/add_trail_ops.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_trail_ops.m,v
retrieving revision 1.21
diff -u -b -r1.21 add_trail_ops.m
--- compiler/add_trail_ops.m 24 Oct 2005 04:13:54 -0000 1.21
+++ compiler/add_trail_ops.m 27 Oct 2005 14:31:18 -0000
@@ -32,8 +32,8 @@
:- module ml_backend__add_trail_ops.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- pred add_trail_ops(module_info::in, proc_info::in, proc_info::out) is det.
@@ -41,18 +41,18 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/add_type.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/add_type.m,v
retrieving revision 1.7
diff -u -b -r1.7 add_type.m
--- compiler/add_type.m 24 Oct 2005 04:13:54 -0000 1.7
+++ compiler/add_type.m 27 Oct 2005 14:31:18 -0000
@@ -11,12 +11,12 @@
:- module hlds__make_hlds__add_type.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -45,21 +45,21 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__foreign.
-:- import_module check_hlds__type_util.
-:- import_module hlds__make_hlds__add_special_pred.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_tags.
-:- import_module hlds__hlds_code_util.
-:- import_module hlds__hlds_out.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.foreign.
+:- import_module check_hlds.type_util.
+:- import_module hlds.make_hlds.add_special_pred.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_tags.
+:- import_module hlds.hlds_code_util.
+:- import_module hlds.hlds_out.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/aditi_builtin_ops.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/aditi_builtin_ops.m,v
retrieving revision 1.19
diff -u -b -r1.19 aditi_builtin_ops.m
--- compiler/aditi_builtin_ops.m 24 Oct 2005 04:13:54 -0000 1.19
+++ compiler/aditi_builtin_ops.m 27 Oct 2005 14:31:18 -0000
@@ -15,8 +15,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -34,21 +34,21 @@
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__type_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 mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module aditi_backend.rl.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.type_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 mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/arg_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/arg_info.m,v
retrieving revision 1.47
diff -u -b -r1.47 arg_info.m
--- compiler/arg_info.m 24 Oct 2005 04:13:54 -0000 1.47
+++ compiler/arg_info.m 27 Oct 2005 14:31:18 -0000
@@ -26,10 +26,10 @@
:- module hlds__arg_info.
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -111,7 +111,7 @@
:- implementation.
-:- import_module check_hlds__mode_util.
+:- import_module check_hlds.mode_util.
:- import_module std_util.
:- import_module map.
Index: compiler/assertion.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/assertion.m,v
retrieving revision 1.41
diff -u -b -r1.41 assertion.m
--- compiler/assertion.m 24 Oct 2005 04:13:54 -0000 1.41
+++ compiler/assertion.m 27 Oct 2005 14:31:18 -0000
@@ -20,11 +20,11 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module std_util.
@@ -129,16 +129,17 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_out.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_out.
+:- 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.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/base_typeclass_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/base_typeclass_info.m,v
retrieving revision 1.39
diff -u -b -r1.39 base_typeclass_info.m
--- compiler/base_typeclass_info.m 24 Oct 2005 04:13:55 -0000 1.39
+++ compiler/base_typeclass_info.m 27 Oct 2005 14:31:18 -0000
@@ -22,8 +22,8 @@
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module hlds__hlds_module.
+:- import_module backend_libs.rtti.
+:- import_module hlds.hlds_module.
:- import_module list.
@@ -32,19 +32,19 @@
:- 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 libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- 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 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 libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- 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.
Index: compiler/basic_block.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/basic_block.m,v
retrieving revision 1.22
diff -u -b -r1.22 basic_block.m
--- compiler/basic_block.m 7 Sep 2005 06:51:50 -0000 1.22
+++ compiler/basic_block.m 27 Oct 2005 14:31:18 -0000
@@ -19,8 +19,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module counter.
@@ -97,7 +97,7 @@
:- implementation.
-:- import_module ll_backend__opt_util.
+:- import_module ll_backend.opt_util.
:- import_module int.
:- import_module require.
Index: compiler/build_mode_constraints.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/build_mode_constraints.m,v
retrieving revision 1.6
diff -u -b -r1.6 build_mode_constraints.m
--- compiler/build_mode_constraints.m 24 Oct 2005 04:13:55 -0000 1.6
+++ compiler/build_mode_constraints.m 27 Oct 2005 14:31:18 -0000
@@ -26,7 +26,7 @@
:- import_module hlds.hlds_module.
% :- import_module hlds.inst_graph.
% % Needed if converting for partial instantiation.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module bimap.
:- import_module list.
@@ -172,15 +172,12 @@
:- implementation.
:- import_module check_hlds.goal_path.
-:- import_module check_hlds.mode_util.
:- import_module check_hlds.inst_match.
-
+:- import_module check_hlds.mode_util.
:- import_module hlds.hlds_data.
:- import_module hlds.passes_aux.
-
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module parse_tree.prog_mode.
-
:- import_module transform_hlds.dependency_graph.
:- import_module bool.
Index: compiler/builtin_ops.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/builtin_ops.m,v
retrieving revision 1.19
diff -u -b -r1.19 builtin_ops.m
--- compiler/builtin_ops.m 24 Oct 2005 04:13:55 -0000 1.19
+++ compiler/builtin_ops.m 27 Oct 2005 14:31:18 -0000
@@ -19,8 +19,8 @@
:- module backend_libs__builtin_ops.
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
:- import_module list.
Index: compiler/bytecode.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/bytecode.m,v
retrieving revision 1.61
diff -u -b -r1.61 bytecode.m
--- compiler/bytecode.m 24 Oct 2005 04:13:55 -0000 1.61
+++ compiler/bytecode.m 27 Oct 2005 14:31:18 -0000
@@ -16,11 +16,11 @@
:- interface.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__hlds_data.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.hlds_data.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module char.
:- import_module io.
@@ -142,10 +142,10 @@
:- implementation.
-:- import_module backend_libs__bytecode_data.
-:- import_module backend_libs__c_util.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.bytecode_data.
+:- import_module backend_libs.c_util.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module int.
Index: compiler/bytecode_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/bytecode_data.m,v
retrieving revision 1.17
diff -u -b -r1.17 bytecode_data.m
--- compiler/bytecode_data.m 30 Mar 2005 01:32:29 -0000 1.17
+++ compiler/bytecode_data.m 27 Oct 2005 14:31:18 -0000
@@ -62,7 +62,7 @@
:- implementation.
-:- import_module parse_tree__error_util.
+:- import_module parse_tree.error_util.
:- import_module char.
:- import_module require.
Index: compiler/bytecode_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/bytecode_gen.m,v
retrieving revision 1.92
diff -u -b -r1.92 bytecode_gen.m
--- compiler/bytecode_gen.m 24 Oct 2005 04:13:55 -0000 1.92
+++ compiler/bytecode_gen.m 27 Oct 2005 14:31:18 -0000
@@ -17,8 +17,8 @@
:- interface.
-:- import_module bytecode_backend__bytecode.
-:- import_module hlds__hlds_module.
+:- import_module bytecode_backend.bytecode.
+:- import_module hlds.hlds_module.
:- import_module io.
:- import_module list.
@@ -41,25 +41,25 @@
% 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__builtin_ops.
-:- 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__globals.
-:- import_module libs__tree.
-:- import_module ll_backend__call_gen. % XXX for arg passing convention
-:- import_module mdbcomp__prim_data.
-:- 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 backend_libs.builtin_ops.
+:- 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.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.tree.
+:- import_module ll_backend.call_gen. % XXX for arg passing convention
+:- import_module mdbcomp.prim_data.
+:- 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.
Index: compiler/c_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/c_util.m,v
retrieving revision 1.28
diff -u -b -r1.28 c_util.m
--- compiler/c_util.m 24 Oct 2005 04:13:55 -0000 1.28
+++ compiler/c_util.m 27 Oct 2005 14:31:18 -0000
@@ -21,9 +21,9 @@
:- interface.
:- import_module aditi_backend.
-:- import_module aditi_backend__rl_file.
-:- import_module backend_libs__builtin_ops.
-:- import_module mdbcomp__prim_data.
+:- import_module aditi_backend.rl_file.
+:- import_module backend_libs.builtin_ops.
+:- import_module mdbcomp.prim_data.
:- import_module char.
:- import_module int.
@@ -165,10 +165,10 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_foreign.
:- import_module bool.
:- import_module list.
Index: compiler/call_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/call_gen.m,v
retrieving revision 1.168
diff -u -b -r1.168 call_gen.m
--- compiler/call_gen.m 24 Oct 2005 04:13:55 -0000 1.168
+++ compiler/call_gen.m 27 Oct 2005 14:31:18 -0000
@@ -20,13 +20,13 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -65,22 +65,22 @@
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__unify_proc.
-:- import_module hlds__arg_info.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__instmap.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__error_util.
+:- import_module aditi_backend.rl.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.type_util.
+:- import_module check_hlds.unify_proc.
+:- import_module hlds.arg_info.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.trace.
:- import_module bool.
:- import_module int.
Index: compiler/check_typeclass.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/check_typeclass.m,v
retrieving revision 1.81
diff -u -b -r1.81 check_typeclass.m
--- compiler/check_typeclass.m 24 Oct 2005 04:13:56 -0000 1.81
+++ compiler/check_typeclass.m 27 Oct 2005 14:31:18 -0000
@@ -67,8 +67,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__make_hlds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.make_hlds.
:- import_module bool.
:- import_module io.
@@ -82,26 +82,27 @@
:- 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__passes_aux.
-:- 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_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- 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.passes_aux.
+:- 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_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 int.
Index: compiler/clause_to_proc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/clause_to_proc.m,v
retrieving revision 1.56
diff -u -b -r1.56 clause_to_proc.m
--- compiler/clause_to_proc.m 24 Oct 2005 04:13:56 -0000 1.56
+++ compiler/clause_to_proc.m 27 Oct 2005 14:31:18 -0000
@@ -10,8 +10,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module list.
:- import_module std_util.
@@ -61,18 +61,18 @@
:- 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__make_hlds.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
+:- 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.make_hlds.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/closure_analysis.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/closure_analysis.m,v
retrieving revision 1.3
diff -u -b -r1.3 closure_analysis.m
--- compiler/closure_analysis.m 24 Oct 2005 04:13:56 -0000 1.3
+++ compiler/closure_analysis.m 27 Oct 2005 14:31:18 -0000
@@ -38,9 +38,9 @@
:- import_module hlds.hlds_goal.
:- import_module hlds.hlds_pred.
:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.options.
-:- import_module parse_tree.error_util.
:- import_module parse_tree.prog_data.
:- import_module parse_tree.prog_out.
:- import_module parse_tree.prog_type.
Index: compiler/code_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/code_gen.m,v
retrieving revision 1.144
diff -u -b -r1.144 code_gen.m
--- compiler/code_gen.m 25 Oct 2005 06:32:57 -0000 1.144
+++ compiler/code_gen.m 27 Oct 2005 14:31:18 -0000
@@ -32,13 +32,13 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
:- import_module io.
:- import_module list.
@@ -70,54 +70,46 @@
:- implementation.
-% Parse tree modules
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-
-% HLDS modules
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__special_pred.
-
-% LLDS code generator modules.
-:- import_module ll_backend__call_gen.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__commit_gen.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__disj_gen.
-:- import_module ll_backend__ite_gen.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__middle_rec.
-:- import_module ll_backend__par_conj_gen.
-:- import_module ll_backend__pragma_c_gen.
-:- import_module ll_backend__switch_gen.
-:- import_module ll_backend__trace.
-:- import_module ll_backend__unify_gen.
-
-% Misc compiler modules
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module mdbcomp__prim_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module libs.tree.
+:- import_module ll_backend.call_gen.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.commit_gen.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.disj_gen.
+:- import_module ll_backend.ite_gen.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.middle_rec.
+:- import_module ll_backend.par_conj_gen.
+:- import_module ll_backend.pragma_c_gen.
+:- import_module ll_backend.switch_gen.
+:- import_module ll_backend.trace.
+:- import_module ll_backend.unify_gen.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
-% Standard library modules
:- import_module assoc_list.
:- import_module bool.
:- import_module char.
:- import_module counter.
:- import_module int.
-:- import_module libs__tree.
:- import_module map.
:- import_module require.
:- import_module set.
Index: compiler/code_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/code_info.m,v
retrieving revision 1.309
diff -u -b -r1.309 code_info.m
--- compiler/code_info.m 24 Oct 2005 04:13:56 -0000 1.309
+++ compiler/code_info.m 27 Oct 2005 14:31:18 -0000
@@ -31,20 +31,20 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__trace.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.trace.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
@@ -57,20 +57,20 @@
:- implementation.
-:- import_module backend_libs__proc_label.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__arg_info.
-:- import_module hlds__hlds_code_util.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__var_locn.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.proc_label.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.arg_info.
+:- import_module hlds.hlds_code_util.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.var_locn.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module char.
:- import_module int.
Index: compiler/code_model.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/code_model.m,v
retrieving revision 1.8
diff -u -b -r1.8 code_model.m
--- compiler/code_model.m 12 Oct 2005 23:51:34 -0000 1.8
+++ compiler/code_model.m 27 Oct 2005 14:31:18 -0000
@@ -23,9 +23,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- type code_model
---> model_det % functional & total
Index: compiler/code_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/code_util.m,v
retrieving revision 1.158
diff -u -b -r1.158 code_util.m
--- compiler/code_util.m 24 Oct 2005 04:13:57 -0000 1.158
+++ compiler/code_util.m 27 Oct 2005 14:31:18 -0000
@@ -19,13 +19,13 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -95,15 +95,15 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module hlds__code_model.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module hlds.code_model.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module char.
Index: compiler/commit_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/commit_gen.m,v
retrieving revision 1.7
diff -u -b -r1.7 commit_gen.m
--- compiler/commit_gen.m 12 Oct 2005 23:51:34 -0000 1.7
+++ compiler/commit_gen.m 27 Oct 2005 14:31:18 -0000
@@ -18,19 +18,19 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
:- pred commit_gen__generate_commit(code_model::in, hlds_goal::in,
code_tree::out, code_info::in, code_info::out) is det.
:- implementation.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
:- import_module require.
:- import_module std_util.
Index: compiler/common.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/common.m,v
retrieving revision 1.84
diff -u -b -r1.84 common.m
--- compiler/common.m 24 Oct 2005 04:13:57 -0000 1.84
+++ compiler/common.m 27 Oct 2005 14:31:18 -0000
@@ -31,10 +31,10 @@
:- module check_hlds__common.
:- interface.
-:- import_module check_hlds__simplify.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.simplify.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -86,23 +86,23 @@
:- 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__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
-:- import_module transform_hlds__pd_cost.
+:- 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.instmap.
+:- import_module hlds.quantification.
+:- 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.pd_cost.
:- import_module bool.
:- import_module eqvclass.
Index: compiler/compile_target_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.73
diff -u -b -r1.73 compile_target_code.m
--- compiler/compile_target_code.m 25 Oct 2005 10:17:26 -0000 1.73
+++ compiler/compile_target_code.m 27 Oct 2005 14:31:18 -0000
@@ -16,10 +16,10 @@
:- interface.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__modules.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.modules.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module io.
@@ -180,16 +180,16 @@
:- implementation.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module hlds__passes_aux.
-:- 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 backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module hlds.passes_aux.
+:- 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.
Index: compiler/compiler_util.m
===================================================================
RCS file: compiler/compiler_util.m
diff -N compiler/compiler_util.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ compiler/compiler_util.m 27 Oct 2005 14:31:18 -0000
@@ -0,0 +1,89 @@
+%-----------------------------------------------------------------------------%
+% vim: ft=mercury ts=4 sw=4 et
+%-----------------------------------------------------------------------------%
+% Copyright (C) 1997-2005 The University of Melbourne.
+% This file may only be copied under the terms of the GNU General
+% Public License - see the file COPYING in the Mercury distribution.
+%-----------------------------------------------------------------------------%
+%
+% Main author: zs.
+%
+% This module contains code that can be helpful in any compiler module.
+
+:- module libs__compiler_util.
+
+:- interface.
+
+:- import_module io.
+
+ % Call error/1 with a "Sorry, not implemented" message.
+ %
+ % Use this for features that should be implemented (or at least
+ % could be implemented).
+ %
+:- func sorry(string, string) = _ is erroneous.
+:- pred sorry(string::in, string::in) is erroneous.
+
+ % unexpected(ModuleName, Message):
+ %
+ % Call error/1 with an "Unexpected" message.
+ % Use this to handle cases which are not expected to arise (i.e. bugs).
+ %
+:- func unexpected(string, string) = _ is erroneous.
+:- pred unexpected(string::in, string::in) is erroneous.
+
+ % Record the fact that a warning has been issued; set the exit status
+ % to error if the --halt-at-warn option is set.
+ %
+:- pred record_warning(io::di, io::uo) is det.
+
+ % Report a warning, and set the exit status to error if the
+ % --halt-at-warn option is set.
+ %
+:- pred report_warning(string::in, io::di, io::uo) is det.
+
+ % Report a warning to the specified stream, and set the exit status
+ % to error if the --halt-at-warn option is set.
+ %
+:- pred report_warning(io__output_stream::in, string::in, io::di, io::uo)
+ is det.
+
+:- implementation.
+
+:- import_module libs.globals.
+:- import_module libs.options.
+
+:- import_module bool.
+:- import_module list.
+:- import_module require.
+:- import_module string.
+
+ % Call error/1 with a "Sorry, not implemented" message.
+ %
+sorry(Module, What) = _ :- sorry(Module, What).
+sorry(Module, What) :-
+ string__format("%s: Sorry, not implemented: %s",
+ [s(Module), s(What)], ErrorMessage),
+ error(ErrorMessage).
+
+unexpected(Module, What) = _ :- unexpected(Module, What).
+unexpected(Module, What) :-
+ string__format("%s: Unexpected: %s", [s(Module), s(What)], ErrorMessage),
+ error(ErrorMessage).
+
+record_warning(!IO) :-
+ globals__io_lookup_bool_option(halt_at_warn, HaltAtWarn, !IO),
+ (
+ HaltAtWarn = yes,
+ io__set_exit_status(1, !IO)
+ ;
+ HaltAtWarn = no
+ ).
+
+report_warning(Message, !IO) :-
+ record_warning(!IO),
+ io__write_string(Message, !IO).
+
+report_warning(Stream, Message, !IO) :-
+ record_warning(!IO),
+ io__write_string(Stream, Message, !IO).
Index: compiler/complexity.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/complexity.m,v
retrieving revision 1.6
diff -u -b -r1.6 complexity.m
--- compiler/complexity.m 24 Oct 2005 04:13:58 -0000 1.6
+++ compiler/complexity.m 27 Oct 2005 14:31:18 -0000
@@ -18,8 +18,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
:- import_module std_util.
@@ -54,24 +54,25 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- 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_util.
-:- import_module transform_hlds__term_norm.
-:- import_module mdbcomp__prim_data.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- 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.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_util.
+:- import_module transform_hlds.term_norm.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/const_prop.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/const_prop.m,v
retrieving revision 1.30
diff -u -b -r1.30 const_prop.m
--- compiler/const_prop.m 24 Oct 2005 04:13:58 -0000 1.30
+++ compiler/const_prop.m 27 Oct 2005 14:31:18 -0000
@@ -24,11 +24,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -48,22 +48,22 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__modes.
-:- 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__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.modes.
+:- 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.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module float.
Index: compiler/constraint.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/constraint.m,v
retrieving revision 1.64
diff -u -b -r1.64 constraint.m
--- compiler/constraint.m 24 Oct 2005 04:13:58 -0000 1.64
+++ compiler/constraint.m 27 Oct 2005 14:31:18 -0000
@@ -21,11 +21,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module bool.
@@ -54,16 +54,16 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module hlds__goal_form.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module hlds.goal_form.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module assoc_list.
:- import_module list.
Index: compiler/context.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/context.m,v
retrieving revision 1.13
diff -u -b -r1.13 context.m
--- compiler/context.m 24 Oct 2005 04:13:58 -0000 1.13
+++ compiler/context.m 27 Oct 2005 14:31:18 -0000
@@ -30,10 +30,10 @@
:- interface.
-:- import_module aditi_backend__magic_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.magic_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -51,11 +51,11 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__instmap.
-:- import_module mdbcomp__prim_data.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.instmap.
+:- import_module mdbcomp.prim_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/continuation_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/continuation_info.m,v
retrieving revision 1.65
diff -u -b -r1.65 continuation_info.m
--- compiler/continuation_info.m 24 Oct 2005 04:13:58 -0000 1.65
+++ compiler/continuation_info.m 27 Oct 2005 14:31:18 -0000
@@ -53,18 +53,18 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__trace_params.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__trace.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.trace_params.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.trace.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
@@ -356,14 +356,14 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module libs__options.
-:- import_module ll_backend__code_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module parse_tree.prog_type.
:- import_module int.
:- import_module require.
Index: compiler/cse_detection.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/cse_detection.m,v
retrieving revision 1.89
diff -u -b -r1.89 cse_detection.m
--- compiler/cse_detection.m 25 Oct 2005 06:32:57 -0000 1.89
+++ compiler/cse_detection.m 27 Oct 2005 14:31:18 -0000
@@ -20,8 +20,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -35,25 +35,25 @@
:- implementation.
-:- import_module check_hlds__det_util.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__modes.
-:- 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__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- 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 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.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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.
Index: compiler/dead_proc_elim.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dead_proc_elim.m,v
retrieving revision 1.103
diff -u -b -r1.103 dead_proc_elim.m
--- compiler/dead_proc_elim.m 24 Oct 2005 04:13:59 -0000 1.103
+++ compiler/dead_proc_elim.m 27 Oct 2005 14:31:18 -0000
@@ -22,9 +22,9 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
:- import_module io.
:- import_module map.
@@ -67,15 +67,16 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_error_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_error_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/deep_profiling.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/deep_profiling.m,v
retrieving revision 1.38
diff -u -b -r1.38 deep_profiling.m
--- compiler/deep_profiling.m 24 Oct 2005 04:13:59 -0000 1.38
+++ compiler/deep_profiling.m 27 Oct 2005 14:31:18 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- pred apply_deep_profiling_transformation(module_info::in, module_info::out)
is det.
@@ -27,26 +27,26 @@
:- implementation.
-:- import_module backend_libs__rtti.
-:- 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_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__trace.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.rtti.
+:- 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_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.trace.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module transform_hlds.
-:- import_module transform_hlds__dependency_graph.
+:- import_module transform_hlds.dependency_graph.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/deforest.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/deforest.m,v
retrieving revision 1.53
diff -u -b -r1.53 deforest.m
--- compiler/deforest.m 24 Oct 2005 04:13:59 -0000 1.53
+++ compiler/deforest.m 27 Oct 2005 14:31:18 -0000
@@ -36,7 +36,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -47,38 +47,38 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__det_report.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_info.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__modes.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__simplify.
-:- import_module check_hlds__unique_modes.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- 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 parse_tree__prog_util.
-:- import_module transform_hlds__dependency_graph.
-:- import_module transform_hlds__inlining.
-:- import_module transform_hlds__pd_cost.
-:- import_module transform_hlds__pd_debug.
-:- import_module transform_hlds__pd_info.
-:- import_module transform_hlds__pd_term.
-:- import_module transform_hlds__pd_util.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.det_report.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_info.
+:- import_module check_hlds.modes.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.simplify.
+:- import_module check_hlds.unique_modes.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- 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 transform_hlds.dependency_graph.
+:- import_module transform_hlds.inlining.
+:- import_module transform_hlds.pd_cost.
+:- import_module transform_hlds.pd_debug.
+:- import_module transform_hlds.pd_info.
+:- import_module transform_hlds.pd_term.
+:- import_module transform_hlds.pd_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/delay_construct.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/delay_construct.m,v
retrieving revision 1.13
diff -u -b -r1.13 delay_construct.m
--- compiler/delay_construct.m 24 Oct 2005 04:13:59 -0000 1.13
+++ compiler/delay_construct.m 27 Oct 2005 14:31:18 -0000
@@ -29,8 +29,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -41,14 +41,14 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.inst_match.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
Index: compiler/delay_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/delay_info.m,v
retrieving revision 1.23
diff -u -b -r1.23 delay_info.m
--- compiler/delay_info.m 12 Oct 2005 23:51:34 -0000 1.23
+++ compiler/delay_info.m 27 Oct 2005 14:31:18 -0000
@@ -22,9 +22,9 @@
:- interface.
-:- import_module check_hlds__mode_errors.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_errors.
+:- import_module hlds.hlds_goal.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -90,9 +90,9 @@
:- implementation.
-:- import_module check_hlds__mode_errors. % for the mode_error_info
+:- import_module check_hlds.mode_errors. % for the mode_error_info
% and delay_info types.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
:- import_module int.
:- import_module map.
Index: compiler/delay_slot.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/delay_slot.m,v
retrieving revision 1.13
diff -u -b -r1.13 delay_slot.m
--- compiler/delay_slot.m 24 Oct 2005 04:13:59 -0000 1.13
+++ compiler/delay_slot.m 27 Oct 2005 14:31:18 -0000
@@ -50,7 +50,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module list.
Index: compiler/dense_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dense_switch.m,v
retrieving revision 1.53
diff -u -b -r1.53 dense_switch.m
--- compiler/dense_switch.m 24 Oct 2005 04:13:59 -0000 1.53
+++ compiler/dense_switch.m 27 Oct 2005 14:31:18 -0000
@@ -18,14 +18,14 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
% Should this switch be implemented as a dense jump table?
% If so, we return the starting and ending values for the table,
@@ -56,13 +56,13 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__trace.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.trace.
:- import_module char.
:- import_module int.
Index: compiler/dependency_graph.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dependency_graph.m,v
retrieving revision 1.79
diff -u -b -r1.79 dependency_graph.m
--- compiler/dependency_graph.m 13 Sep 2005 04:56:00 -0000 1.79
+++ compiler/dependency_graph.m 27 Oct 2005 14:31:18 -0000
@@ -23,8 +23,8 @@
:- module transform_hlds__dependency_graph.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
:- import_module list.
@@ -123,17 +123,17 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module eqvclass.
Index: compiler/det_analysis.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/det_analysis.m,v
retrieving revision 1.180
diff -u -b -r1.180 det_analysis.m
--- compiler/det_analysis.m 24 Oct 2005 04:13:59 -0000 1.180
+++ compiler/det_analysis.m 27 Oct 2005 14:31:18 -0000
@@ -52,15 +52,15 @@
:- interface.
-:- import_module check_hlds__det_report.
-:- import_module check_hlds__det_util.
-:- 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__globals.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.det_report.
+:- import_module check_hlds.det_util.
+:- 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.globals.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -89,8 +89,8 @@
% and returns the annotated goal in `Goal'.
%
:- pred det_infer_goal(hlds_goal::in, hlds_goal::out, instmap::in,
- soln_context::in, det_info::in, determinism::out, list(det_msg)::out)
- is det.
+ soln_context::in, list(failing_context)::in, det_info::in,
+ determinism::out, list(failing_context)::out, list(det_msg)::out) is det.
% Work out how many solutions are needed for a given determinism.
%
@@ -129,17 +129,19 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__modecheck_call.
-:- 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 libs__options.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_out.
+:- 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 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_out.
:- import_module assoc_list.
:- import_module bool.
@@ -279,8 +281,8 @@
proc_info_get_initial_instmap(Proc0, !.ModuleInfo, InstMap0),
proc_info_vartypes(Proc0, VarTypes),
det_info_init(!.ModuleInfo, VarTypes, PredId, ProcId, Globals, DetInfo),
- det_infer_goal(Goal0, Goal, InstMap0, SolnContext, DetInfo, InferDetism,
- !:Msgs),
+ det_infer_goal(Goal0, Goal, InstMap0, SolnContext, [], DetInfo,
+ InferDetism, _, !:Msgs),
% Take the worst of the old and inferred detisms. This is needed to prevent
% loops on p :- not(p), at least if the initial assumed detism is det.
@@ -342,7 +344,7 @@
%-----------------------------------------------------------------------------%
det_infer_goal(Goal0 - GoalInfo0, Goal - GoalInfo, InstMap0, !.SolnContext,
- DetInfo, Detism, !:Msgs) :-
+ RightFailingContexts, DetInfo, Detism, GoalFailingContexts, !:Msgs) :-
goal_info_get_nonlocals(GoalInfo0, NonLocalVars),
goal_info_get_instmap_delta(GoalInfo0, InstmapDelta),
@@ -385,8 +387,9 @@
Prune = AddPruning
),
- det_infer_goal_2(Goal0, Goal1, GoalInfo0, InstMap0, !.SolnContext, DetInfo,
- InternalDetism0, !:Msgs),
+ det_infer_goal_2(Goal0, Goal1, GoalInfo0, InstMap0, !.SolnContext,
+ RightFailingContexts, DetInfo, InternalDetism0, GoalFailingContexts,
+ !:Msgs),
determinism_components(InternalDetism0, InternalCanFail, InternalSolns0),
(
@@ -485,22 +488,25 @@
%-----------------------------------------------------------------------------%
:- pred det_infer_goal_2(hlds_goal_expr::in, hlds_goal_expr::out,
- hlds_goal_info::in, instmap::in, soln_context::in, det_info::in,
- determinism::out, list(det_msg)::out) is det.
+ hlds_goal_info::in, instmap::in, soln_context::in,
+ list(failing_context)::in, det_info::in, determinism::out,
+ list(failing_context)::out, list(det_msg)::out) is det.
det_infer_goal_2(GoalExpr0, GoalExpr, GoalInfo, InstMap0, SolnContext,
- DetInfo, Detism, !:Msgs) :-
+ RightFailingContexts, DetInfo, Detism, GoalFailingContexts, !:Msgs) :-
(
GoalExpr0 = conj(Goals0),
% The determinism of a conjunction is the worst case of the elements
% of that conjuction.
- det_infer_conj(Goals0, Goals, InstMap0, SolnContext, DetInfo, Detism,
+ det_infer_conj(Goals0, Goals, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, Detism, [], GoalFailingContexts,
!:Msgs),
GoalExpr = conj(Goals)
;
GoalExpr0 = par_conj(Goals0),
- det_infer_par_conj(Goals0, Goals, InstMap0, SolnContext, DetInfo,
- Detism, !:Msgs),
+ det_infer_par_conj(Goals0, Goals, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, Detism, [], GoalFailingContexts,
+ !:Msgs),
(
determinism_components(Detism, CanFail, Solns),
CanFail = cannot_fail,
@@ -516,8 +522,17 @@
GoalExpr = par_conj(Goals)
;
GoalExpr0 = disj(Goals0),
- det_infer_disj(Goals0, Goals, InstMap0, SolnContext, DetInfo,
- can_fail, at_most_zero, Detism, !:Msgs),
+ det_infer_disj(Goals0, Goals, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, can_fail, at_most_zero, Detism,
+ [], GoalFailingContexts0, !:Msgs),
+ (
+ Goals = [],
+ goal_info_get_context(GoalInfo, Context),
+ GoalFailingContexts = [Context - fail_goal | GoalFailingContexts0]
+ ;
+ Goals = [_ | _],
+ GoalFailingContexts = GoalFailingContexts0
+ ),
GoalExpr = disj(Goals)
;
GoalExpr0 = switch(Var, SwitchCanFail, Cases0),
@@ -527,8 +542,9 @@
% then it is semideterministic or worse - this is determined
% in switch_detection.m and handled via the SwitchCanFail field.
- det_infer_switch(Cases0, Cases, InstMap0, SolnContext, DetInfo,
- cannot_fail, at_most_zero, CasesDetism, !:Msgs),
+ det_infer_switch(Cases0, Cases, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, cannot_fail, at_most_zero,
+ CasesDetism, [], GoalFailingContexts0, !:Msgs),
determinism_components(CasesDetism, CasesCanFail, CasesSolns),
% The switch variable tests are in a first_soln context if and only
% if the switch goal as a whole was in a first_soln context and the
@@ -543,73 +559,103 @@
),
ExaminesRep = yes,
det_check_for_noncanonical_type(Var, ExaminesRep, SwitchCanFail,
- SwitchSolnContext, GoalInfo, switch, DetInfo, SwitchSolns, !Msgs),
+ SwitchSolnContext, GoalFailingContexts0, RightFailingContexts,
+ GoalInfo, switch, DetInfo, SwitchSolns, !Msgs),
det_conjunction_canfail(SwitchCanFail, CasesCanFail, CanFail),
det_conjunction_maxsoln(SwitchSolns, CasesSolns, NumSolns),
determinism_components(Detism, CanFail, NumSolns),
+ (
+ SwitchCanFail = can_fail,
+ goal_info_get_context(GoalInfo, SwitchContext),
+ GoalFailingContexts = [SwitchContext - incomplete_switch(Var) |
+ GoalFailingContexts0]
+ ;
+ SwitchCanFail = cannot_fail,
+ GoalFailingContexts = GoalFailingContexts0
+ ),
GoalExpr = switch(Var, SwitchCanFail, Cases)
;
- GoalExpr0 = call(PredId, ModeId0, Args, Builtin, UnifyContext, Name),
+ GoalExpr0 = call(PredId, ProcId0, Args, Builtin, UnifyContext, Name),
% For calls, just look up the determinism entry associated with
% the called predicate.
% This is the point at which annotations start changing
% when we iterate to fixpoint for global determinism inference.
- det_lookup_detism(DetInfo, PredId, ModeId0, Detism0),
+ det_lookup_detism(DetInfo, PredId, ProcId0, Detism0),
% Make sure we don't try to call a committed-choice pred
% from a non-committed-choice context.
determinism_components(Detism0, CanFail, NumSolns),
(
NumSolns = at_most_many_cc,
- SolnContext \= first_soln
+ SolnContext = all_solns
->
(
- det_find_matching_non_cc_mode(DetInfo, PredId, ModeId0,
- ModeIdPrime)
+ det_find_matching_non_cc_mode(DetInfo, PredId, ProcId0,
+ ProcIdPrime)
->
- ModeId = ModeIdPrime,
+ ProcId = ProcIdPrime,
!:Msgs = [],
determinism_components(Detism, CanFail, at_most_many)
;
+ det_get_proc_info(DetInfo, ProcInfo),
+ proc_info_varset(ProcInfo, VarSet),
!:Msgs = [cc_pred_in_wrong_context(GoalInfo, Detism0,
- PredId, ModeId0)],
- ModeId = ModeId0,
+ PredId, ProcId0, VarSet, RightFailingContexts)],
+ ProcId = ProcId0,
% Code elsewhere relies on the assumption that
- % SolnContext \= first_soln => NumSolns \= at_most_many_cc,
+ % SolnContext = all_solns => NumSolns \= at_most_many_cc,
% so we need to enforce that here.
determinism_components(Detism, CanFail, at_most_many)
)
;
!:Msgs = [],
- ModeId = ModeId0,
+ ProcId = ProcId0,
Detism = Detism0
),
- GoalExpr = call(PredId, ModeId, Args, Builtin, UnifyContext, Name)
+ (
+ CanFail = can_fail,
+ goal_info_get_context(GoalInfo, Context),
+ GoalFailingContexts = [Context - call_goal(PredId, ProcId)]
+ ;
+ CanFail = cannot_fail,
+ GoalFailingContexts = []
+ ),
+ GoalExpr = call(PredId, ProcId, Args, Builtin, UnifyContext, Name)
;
- GoalExpr0 = generic_call(_GenericCall, _ArgVars, _Modes, CallDetism),
+ GoalExpr0 = generic_call(GenericCall, _ArgVars, _Modes, CallDetism),
determinism_components(CallDetism, CanFail, NumSolns),
(
NumSolns = at_most_many_cc,
- SolnContext \= first_soln
+ SolnContext = all_solns
->
% This error can only occur for higher-order calls.
% Class method calls are only introduced by polymorphism,
% and the aditi_builtins are all det (for the updates)
% or introduced later (for calls).
+ det_get_proc_info(DetInfo, ProcInfo),
+ proc_info_varset(ProcInfo, VarSet),
!:Msgs = [higher_order_cc_pred_in_wrong_context(GoalInfo,
- CallDetism)],
+ CallDetism, VarSet, RightFailingContexts)],
% Code elsewhere relies on the assumption that
- % SolnContext \= first_soln => NumSolns \= at_most_many_cc,
+ % SolnContext = all_soln => NumSolns \= at_most_many_cc,
% so we need to enforce that here.
determinism_components(Detism, CanFail, at_most_many)
;
!:Msgs = [],
Detism = CallDetism
),
+ (
+ CanFail = can_fail,
+ goal_info_get_context(GoalInfo, Context),
+ GoalFailingContexts = [Context - generic_call_goal(GenericCall)]
+ ;
+ CanFail = cannot_fail,
+ GoalFailingContexts = []
+ ),
GoalExpr = GoalExpr0
;
- GoalExpr0 = unify(LHS, RHS0, Mode, Unify, Context),
+ GoalExpr0 = unify(LHS, RHS0, Mode, Unify, UnifyContext),
% Unifications are either deterministic or semideterministic.
% (see det_infer_unify).
(
@@ -624,8 +670,8 @@
det_info_get_module_info(DetInfo, ModuleInfo),
instmap__pre_lambda_update(ModuleInfo, Vars, Modes,
InstMap0, InstMap1),
- det_infer_goal(Goal0, Goal, InstMap1, LambdaSolnContext, DetInfo,
- LambdaInferredDet, GoalMsgs),
+ det_infer_goal(Goal0, Goal, InstMap1, LambdaSolnContext, [],
+ DetInfo, LambdaInferredDet, _LambdaFailingContexts, GoalMsgs),
det_check_lambda(LambdaDeclaredDet, LambdaInferredDet,
Goal, GoalInfo, DetInfo, CheckLambdaMsgs),
list__append(GoalMsgs, CheckLambdaMsgs, !:Msgs),
@@ -638,10 +684,37 @@
det_infer_unify_canfail(Unify, UnifyCanFail),
det_infer_unify_examines_rep(Unify, ExaminesRepresentation),
det_check_for_noncanonical_type(LHS, ExaminesRepresentation,
- UnifyCanFail, SolnContext, GoalInfo, unify(Context), DetInfo,
- UnifyNumSolns, !Msgs),
+ UnifyCanFail, SolnContext, RightFailingContexts, [], GoalInfo,
+ unify(UnifyContext), DetInfo, UnifyNumSolns, !Msgs),
determinism_components(Detism, UnifyCanFail, UnifyNumSolns),
- GoalExpr = unify(LHS, RHS, Mode, Unify, Context)
+ (
+ UnifyCanFail = can_fail,
+ goal_info_get_context(GoalInfo, Context),
+ (
+ Unify = construct(_, _, _, _, _, _, _),
+ unexpected(this_file, "can_fail construct")
+ ;
+ Unify = assign(_, _),
+ unexpected(this_file, "can_fail assign")
+ ;
+ Unify = complicated_unify(_, _, _),
+ ( RHS = var(RHSVar) ->
+ GoalFailingContexts = [Context - test_goal(LHS, RHSVar)]
+ ;
+ unexpected(this_file, "complicated_unify but no var")
+ )
+ ;
+ Unify = deconstruct(Var, ConsId, _, _, _, _),
+ GoalFailingContexts = [Context - deconstruct_goal(Var, ConsId)]
+ ;
+ Unify = simple_test(Var1, Var2),
+ GoalFailingContexts = [Context - test_goal(Var1, Var2)]
+ )
+ ;
+ UnifyCanFail = cannot_fail,
+ GoalFailingContexts = []
+ ),
+ GoalExpr = unify(LHS, RHS, Mode, Unify, UnifyContext)
;
GoalExpr0 = if_then_else(Vars, Cond0, Then0, Else0),
@@ -651,8 +724,9 @@
% First process the `then' part
update_instmap(Cond0, InstMap0, InstMap1),
- det_infer_goal(Then0, Then, InstMap1, SolnContext, DetInfo,
- ThenDetism, ThenMsgs),
+ det_infer_goal(Then0, Then, InstMap1, SolnContext,
+ RightFailingContexts, DetInfo, ThenDetism, ThenFailingContexts,
+ ThenMsgs),
determinism_components(ThenDetism, ThenCanFail, ThenMaxSoln),
% Next, work out the right soln_context to use for the condition.
@@ -666,15 +740,16 @@
;
CondSolnContext = all_solns
),
-
% Process the `condition' part
- det_infer_goal(Cond0, Cond, InstMap0, CondSolnContext, DetInfo,
- CondDetism, CondMsgs),
+ det_infer_goal(Cond0, Cond, InstMap0, CondSolnContext,
+ ThenFailingContexts ++ RightFailingContexts, DetInfo,
+ CondDetism, _CondFailingContexts, CondMsgs),
determinism_components(CondDetism, CondCanFail, CondMaxSoln),
% Process the `else' part
- det_infer_goal(Else0, Else, InstMap0, SolnContext, DetInfo,
- ElseDetism, ElseMsgs),
+ det_infer_goal(Else0, Else, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, ElseDetism, ElseFailingContexts,
+ ElseMsgs),
determinism_components(ElseDetism, ElseCanFail, ElseMaxSoln),
% Finally combine the results from the three parts.
@@ -697,6 +772,10 @@
det_switch_canfail(ThenCanFail, ElseCanFail, CanFail),
determinism_components(Detism, CanFail, MaxSoln)
),
+ % Failing contexts in the condition are ignored, since they can't lead
+ % to failure of the if-then-else as a whole without one or more failing
+ % contexts in the then part or the else part.
+ GoalFailingContexts = ThenFailingContexts ++ ElseFailingContexts,
!:Msgs = CondMsgs ++ ThenMsgs ++ ElseMsgs,
GoalExpr = if_then_else(Vars, Cond, Then, Else)
;
@@ -708,8 +787,8 @@
% Question: should we warn about the negation of goals that either
% cannot succeed or cannot fail?
% Answer: yes, probably, but it's not a high priority.
- det_infer_goal(Goal0, Goal, InstMap0, first_soln, DetInfo, NegDetism,
- !:Msgs),
+ det_infer_goal(Goal0, Goal, InstMap0, first_soln, [], DetInfo,
+ NegDetism, _NegatedGoalCanFail, !:Msgs),
det_negation_det(NegDetism, MaybeDetism),
(
MaybeDetism = no,
@@ -717,6 +796,15 @@
;
MaybeDetism = yes(Detism)
),
+ determinism_components(Detism, CanFail, _),
+ (
+ CanFail = can_fail,
+ goal_info_get_context(GoalInfo, Context),
+ GoalFailingContexts = [Context - negated_goal]
+ ;
+ CanFail = cannot_fail,
+ GoalFailingContexts = []
+ ),
GoalExpr = not(Goal)
;
GoalExpr0 = scope(Reason, Goal0),
@@ -760,9 +848,10 @@
SolnContextToUse = SolnContext,
ScopeMsgs = []
),
- det_infer_goal(Goal0, Goal, InstMap0, SolnContextToUse, DetInfo,
- Detism, SubMsgs),
- list__append(SubMsgs, ScopeMsgs, !:Msgs),
+ det_infer_goal(Goal0, Goal, InstMap0, SolnContextToUse,
+ RightFailingContexts, DetInfo, Detism, GoalFailingContexts,
+ SubMsgs),
+ !:Msgs = SubMsgs ++ ScopeMsgs,
GoalExpr = scope(Reason, Goal)
;
GoalExpr0 = foreign_proc(Attributes, PredId, ProcId, _Args, _ExtraArgs,
@@ -792,19 +881,29 @@
),
(
NumSolns1 = at_most_many_cc,
- SolnContext \= first_soln
+ SolnContext = all_solns
->
+ proc_info_varset(ProcInfo, VarSet),
!:Msgs = [cc_pred_in_wrong_context(GoalInfo, Detism0,
- PredId, ProcId) | !.Msgs],
+ PredId, ProcId, VarSet, RightFailingContexts) | !.Msgs],
NumSolns = at_most_many
;
NumSolns = NumSolns1
),
- determinism_components(Detism, CanFail, NumSolns)
+ determinism_components(Detism, CanFail, NumSolns),
+ (
+ CanFail = can_fail,
+ goal_info_get_context(GoalInfo, Context),
+ GoalFailingContexts = [Context - call_goal(PredId, ProcId)]
+ ;
+ CanFail = cannot_fail,
+ GoalFailingContexts = []
+ )
;
MaybeDetism = no,
!:Msgs = [pragma_c_code_without_det_decl(PredId, ProcId)],
- Detism = erroneous
+ Detism = erroneous,
+ GoalFailingContexts = []
),
GoalExpr = GoalExpr0
;
@@ -816,12 +915,14 @@
%-----------------------------------------------------------------------------%
:- pred det_infer_conj(list(hlds_goal)::in, list(hlds_goal)::out, instmap::in,
- soln_context::in, det_info::in, determinism::out, list(det_msg)::out)
- is det.
+ soln_context::in, list(failing_context)::in, det_info::in,
+ determinism::out, list(failing_context)::in, list(failing_context)::out,
+ list(det_msg)::out) is det.
-det_infer_conj([], [], _InstMap0, _SolnContext, _DetInfo, det, []).
+det_infer_conj([], [], _InstMap0, _SolnContext, _RightFailingContexts,
+ _DetInfo, det, !ConjFailingContexts, []).
det_infer_conj([Goal0 | Goals0], [Goal | Goals], InstMap0, SolnContext,
- DetInfo, Detism, Msgs) :-
+ RightFailingContexts, DetInfo, Detism, !ConjFailingContexts, Msgs) :-
% We should look to see when we get to a not_reached point
% and optimize away the remaining elements of the conjunction.
% But that optimization is done in the code generator anyway.
@@ -831,8 +932,9 @@
% First, process the second and subsequent conjuncts.
update_instmap(Goal0, InstMap0, InstMap1),
- det_infer_conj(Goals0, Goals, InstMap1, SolnContext, DetInfo,
- TailDetism, TailMsgs),
+ det_infer_conj(Goals0, Goals, InstMap1, SolnContext,
+ RightFailingContexts, DetInfo, TailDetism, !ConjFailingContexts,
+ TailMsgs),
determinism_components(TailDetism, TailCanFail, _TailMaxSolns),
% Next, work out whether the first conjunct is in a first_soln context
@@ -840,7 +942,6 @@
% of the conjunction. However, even if we need only the first solution
% of the conjunction, we may need to generate more than one solution
% of the first conjunct if the later conjuncts may possibly fail.
- %
(
TailCanFail = cannot_fail,
SolnContext = first_soln
@@ -850,44 +951,53 @@
HeadSolnContext = all_solns
),
% Process the first conjunct.
- det_infer_goal(Goal0, Goal, InstMap0, HeadSolnContext, DetInfo, HeadDetism,
- HeadMsgs),
+ det_infer_goal(Goal0, Goal, InstMap0, HeadSolnContext,
+ !.ConjFailingContexts ++ RightFailingContexts, DetInfo, HeadDetism,
+ GoalFailingContexts, HeadMsgs),
% Finally combine the results computed above.
det_conjunction_detism(HeadDetism, TailDetism, Detism),
+ !:ConjFailingContexts = GoalFailingContexts ++ !.ConjFailingContexts,
Msgs = HeadMsgs ++ TailMsgs.
:- pred det_infer_par_conj(list(hlds_goal)::in, list(hlds_goal)::out,
- instmap::in, soln_context::in, det_info::in, determinism::out,
+ instmap::in, soln_context::in, list(failing_context)::in, det_info::in,
+ determinism::out, list(failing_context)::in, list(failing_context)::out,
list(det_msg)::out) is det.
-det_infer_par_conj([], [], _InstMap0, _SolnContext, _DetInfo, det, []).
+det_infer_par_conj([], [], _InstMap0, _SolnContext, _RightFailingContexts,
+ _DetInfo, det, !ConjFailingContexts, []).
det_infer_par_conj([Goal0 | Goals0], [Goal | Goals], InstMap0, SolnContext,
- DetInfo, Detism, Msgs) :-
- det_infer_goal(Goal0, Goal, InstMap0, SolnContext, DetInfo,
- HeadDetism, HeadMsgs),
+ RightFailingContexts, DetInfo, Detism, !ConjFailingContexts, Msgs) :-
+ det_infer_goal(Goal0, Goal, InstMap0, SolnContext, RightFailingContexts,
+ DetInfo, HeadDetism, GoalFailingContexts, HeadMsgs),
determinism_components(HeadDetism, HeadCanFail, HeadMaxSolns),
- det_infer_par_conj(Goals0, Goals, InstMap0, SolnContext, DetInfo,
- TailDetism, TailMsgs),
+ det_infer_par_conj(Goals0, Goals, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, TailDetism, !ConjFailingContexts,
+ TailMsgs),
determinism_components(TailDetism, TailCanFail, TailMaxSolns),
det_conjunction_maxsoln(HeadMaxSolns, TailMaxSolns, MaxSolns),
det_conjunction_canfail(HeadCanFail, TailCanFail, CanFail),
determinism_components(Detism, CanFail, MaxSolns),
+ !:ConjFailingContexts = GoalFailingContexts ++ !.ConjFailingContexts,
Msgs = HeadMsgs ++ TailMsgs.
:- pred det_infer_disj(list(hlds_goal)::in, list(hlds_goal)::out, instmap::in,
- soln_context::in, det_info::in, can_fail::in, soln_count::in,
- determinism::out, list(det_msg)::out) is det.
+ soln_context::in, list(failing_context)::in, det_info::in,
+ can_fail::in, soln_count::in, determinism::out,
+ list(failing_context)::in, list(failing_context)::out,
+ list(det_msg)::out) is det.
-det_infer_disj([], [], _InstMap0, _SolnContext, _DetInfo, CanFail, MaxSolns,
- Detism, []) :-
+det_infer_disj([], [], _InstMap0, _SolnContext, _RightFailingContexts,
+ _DetInfo, CanFail, MaxSolns, Detism, !DisjFailingContexts, []) :-
determinism_components(Detism, CanFail, MaxSolns).
det_infer_disj([Goal0 | Goals0], [Goal | Goals], InstMap0, SolnContext,
- DetInfo, !.CanFail, !.MaxSolns, Detism, Msgs) :-
- det_infer_goal(Goal0, Goal, InstMap0, SolnContext, DetInfo, FirstDetism,
- FirstMsgs),
+ RightFailingContexts, DetInfo, !.CanFail, !.MaxSolns, Detism,
+ !DisjFailingContexts, Msgs) :-
+ det_infer_goal(Goal0, Goal, InstMap0, SolnContext, RightFailingContexts,
+ DetInfo, FirstDetism, GoalFailingContexts, FirstMsgs),
determinism_components(FirstDetism, FirstCanFail, FirstMaxSolns),
Goal = _ - GoalInfo,
% If a disjunct cannot succeed but is marked with the
@@ -921,31 +1031,38 @@
;
true
),
- det_infer_disj(Goals0, Goals, InstMap0, SolnContext, DetInfo, !.CanFail,
- !.MaxSolns, Detism, LaterMsgs),
+ det_infer_disj(Goals0, Goals, InstMap0, SolnContext, RightFailingContexts,
+ DetInfo, !.CanFail, !.MaxSolns, Detism, !DisjFailingContexts,
+ LaterMsgs),
+ !:DisjFailingContexts = GoalFailingContexts ++ !.DisjFailingContexts,
Msgs = FirstMsgs ++ LaterMsgs.
:- pred det_infer_switch(list(case)::in, list(case)::out, instmap::in,
- soln_context::in, det_info::in, can_fail::in, soln_count::in,
- determinism::out, list(det_msg)::out) is det.
+ soln_context::in, list(failing_context)::in, det_info::in, can_fail::in,
+ soln_count::in, determinism::out,
+ list(failing_context)::in, list(failing_context)::out,
+ list(det_msg)::out) is det.
-det_infer_switch([], [], _InstMap0, _SolnContext, _DetInfo, CanFail, MaxSolns,
- Detism, []) :-
+det_infer_switch([], [], _InstMap0, _SolnContext, _RightFailingContexts,
+ _DetInfo, CanFail, MaxSolns, Detism, !SwitchFailingContexts, []) :-
determinism_components(Detism, CanFail, MaxSolns).
det_infer_switch([Case0 | Cases0], [Case | Cases], InstMap0, SolnContext,
- DetInfo, !.CanFail, !.MaxSolns, Detism, Msgs) :-
+ RightFailingContexts, DetInfo, !.CanFail, !.MaxSolns, Detism,
+ !SwitchFailingContexts, Msgs) :-
% Technically, we should update the instmap to reflect the knowledge that
% the var is bound to this particular constructor, but we wouldn't use
% that information here anyway, so we don't bother.
Case0 = case(ConsId, Goal0),
- det_infer_goal(Goal0, Goal, InstMap0, SolnContext, DetInfo,
- FirstDetism, FirstMsgs),
+ det_infer_goal(Goal0, Goal, InstMap0, SolnContext, RightFailingContexts,
+ DetInfo, FirstDetism, GoalFailingContexts, FirstMsgs),
Case = case(ConsId, Goal),
determinism_components(FirstDetism, FirstCanFail, FirstMaxSolns),
det_switch_canfail(!.CanFail, FirstCanFail, !:CanFail),
det_switch_maxsoln(!.MaxSolns, FirstMaxSolns, !:MaxSolns),
- det_infer_switch(Cases0, Cases, InstMap0, SolnContext, DetInfo, !.CanFail,
- !.MaxSolns, Detism, LaterMsgs),
+ det_infer_switch(Cases0, Cases, InstMap0, SolnContext,
+ RightFailingContexts, DetInfo, !.CanFail, !.MaxSolns, Detism,
+ !SwitchFailingContexts, LaterMsgs),
+ !:SwitchFailingContexts = GoalFailingContexts ++ !.SwitchFailingContexts,
Msgs = FirstMsgs ++ LaterMsgs.
%-----------------------------------------------------------------------------%
@@ -987,12 +1104,13 @@
%-----------------------------------------------------------------------------%
:- pred det_check_for_noncanonical_type(prog_var::in, bool::in, can_fail::in,
- soln_context::in, hlds_goal_info::in, cc_unify_context::in,
- det_info::in, soln_count::out, list(det_msg)::in, list(det_msg)::out)
- is det.
+ soln_context::in, list(failing_context)::in, list(failing_context)::in,
+ hlds_goal_info::in, cc_unify_context::in, det_info::in, soln_count::out,
+ list(det_msg)::in, list(det_msg)::out) is det.
det_check_for_noncanonical_type(Var, ExaminesRepresentation, CanFail,
- SolnContext, GoalInfo, GoalContext, DetInfo, NumSolns, !Msgs) :-
+ SolnContext, FailingContextsA, FailingContextsB, GoalInfo, GoalContext,
+ DetInfo, NumSolns, !Msgs) :-
(
% Check for unifications that attempt to examine the representation
% of a type that does not have a single representation for each
@@ -1008,16 +1126,18 @@
proc_info_varset(ProcInfo, VarSet),
!:Msgs = [cc_unify_can_fail(GoalInfo, Var, Type, VarSet,
GoalContext) | !.Msgs]
- ; SolnContext \= first_soln ->
+ ; SolnContext = all_solns ->
proc_info_varset(ProcInfo, VarSet),
!:Msgs = [cc_unify_in_wrong_context(GoalInfo, Var, Type, VarSet,
- GoalContext) | !.Msgs]
+ GoalContext, FailingContextsA ++ FailingContextsB) | !.Msgs]
;
true
),
- ( SolnContext = first_soln ->
+ (
+ SolnContext = first_soln,
NumSolns = at_most_many_cc
;
+ SolnContext = all_solns,
NumSolns = at_most_many
)
;
@@ -1344,5 +1464,11 @@
;
MaybeDet = no
).
+
+%-----------------------------------------------------------------------------%
+
+:- func this_file = string.
+
+this_file = "det_analysis.m".
%-----------------------------------------------------------------------------%
Index: compiler/det_report.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/det_report.m,v
retrieving revision 1.107
diff -u -b -r1.107 det_report.m
--- compiler/det_report.m 24 Oct 2005 04:14:00 -0000 1.107
+++ compiler/det_report.m 27 Oct 2005 23:55:16 -0000
@@ -16,15 +16,16 @@
:- interface.
-:- import_module check_hlds__det_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.det_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
:- import_module set.
+:- import_module std_util.
:- type det_msg
% The followintg are warnings.
@@ -53,10 +54,11 @@
; cc_unify_can_fail(hlds_goal_info, prog_var, mer_type,
prog_varset, cc_unify_context)
; cc_unify_in_wrong_context(hlds_goal_info, prog_var,
- mer_type, prog_varset, cc_unify_context)
+ mer_type, prog_varset, cc_unify_context, list(failing_context))
; cc_pred_in_wrong_context(hlds_goal_info, determinism,
- pred_id, proc_id)
- ; higher_order_cc_pred_in_wrong_context(hlds_goal_info, determinism)
+ pred_id, proc_id, prog_varset, list(failing_context))
+ ; higher_order_cc_pred_in_wrong_context(hlds_goal_info, determinism,
+ prog_varset, list(failing_context))
; error_in_lambda(determinism, determinism, % declared, inferred
hlds_goal, hlds_goal_info, pred_id, proc_id)
; par_conj_not_det(determinism, pred_id, proc_id,
@@ -80,6 +82,17 @@
---> unify(unify_context)
; switch.
+:- type failing_context == pair(prog_context, failing_goal).
+
+:- type failing_goal
+ ---> incomplete_switch(prog_var)
+ ; fail_goal
+ ; test_goal(prog_var, prog_var)
+ ; deconstruct_goal(prog_var, cons_id)
+ ; call_goal(pred_id, proc_id)
+ ; generic_call_goal(generic_call)
+ ; negated_goal.
+
%-----------------------------------------------------------------------------%
% Check all the determinism declarations in this module.
@@ -141,23 +154,24 @@
:- 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__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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.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.
:- import_module bool.
@@ -165,7 +179,6 @@
:- import_module int.
:- import_module map.
:- import_module require.
-:- import_module std_util.
:- import_module string.
:- import_module term.
:- import_module varset.
@@ -234,8 +247,10 @@
->
Message = "warning: determinism declaration " ++
"could be tighter.\n",
+ record_warning(!IO),
report_determinism_problem(PredId, ProcId, !.ModuleInfo,
- Message, DeclaredDetism, InferredDetism, !IO)
+ Message, DeclaredDetism, InferredDetism, ReportSpec),
+ write_error_specs([ReportSpec], !IO)
;
true
)
@@ -243,17 +258,16 @@
Cmp = tighter,
module_info_incr_errors(!ModuleInfo),
Message = " error: determinism declaration not satisfied.\n",
+ record_warning(!IO),
report_determinism_problem(PredId, ProcId, !.ModuleInfo, Message,
- DeclaredDetism, InferredDetism, !IO),
+ DeclaredDetism, InferredDetism, ReportSpec),
proc_info_goal(ProcInfo0, Goal),
proc_info_vartypes(ProcInfo0, VarTypes),
globals__io_get_globals(Globals, !IO),
det_info_init(!.ModuleInfo, VarTypes, PredId, ProcId, Globals,
DetInfo),
- det_diagnose_goal(Goal, DeclaredDetism, [], DetInfo, _, !IO)
- % XXX With the right verbosity options, we want to call
- % report_determinism_problem only if diagnose returns false,
- % i.e. it didn't print a message.
+ det_diagnose_goal(Goal, DeclaredDetism, [], DetInfo, _, [], Specs),
+ write_error_specs([ReportSpec | Specs], !IO)
)
),
@@ -412,11 +426,11 @@
).
:- pred report_determinism_problem(pred_id::in, proc_id::in, module_info::in,
- string::in, determinism::in, determinism::in, io::di, io::uo) is det.
+ string::in, determinism::in, determinism::in,
+ error_msg_spec::out(known_error_msg_spec)) is det.
report_determinism_problem(PredId, ProcId, ModuleInfo, Message,
- DeclaredDetism, InferredDetism, !IO) :-
- record_warning(!IO),
+ DeclaredDetism, InferredDetism, Spec) :-
module_info_pred_proc_info(ModuleInfo, PredId, ProcId, _, ProcInfo),
proc_info_context(ProcInfo, Context),
ProcPieces = describe_one_proc_name_mode(ModuleInfo,
@@ -426,7 +440,7 @@
words("Declared `" ++ determinism_to_string(DeclaredDetism)
++ "', inferred `" ++ determinism_to_string(InferredDetism)
++ "'.")],
- write_error_pieces(Context, 0, Pieces, !IO).
+ Spec = error_msg_spec(no, Context, 0, Pieces).
%-----------------------------------------------------------------------------%
@@ -486,14 +500,16 @@
% Find out what is wrong and print a report of the cause.
%
:- pred det_diagnose_goal(hlds_goal::in, determinism::in,
- list(switch_context)::in, det_info::in, bool::out, io::di, io::uo) is det.
+ list(switch_context)::in, det_info::in, bool::out,
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
det_diagnose_goal(Goal - GoalInfo, Desired, SwitchContext, DetInfo, Diagnosed,
- !IO) :-
+ !Specs) :-
goal_info_get_determinism(GoalInfo, Actual),
( compare_determinisms(Desired, Actual, tighter) ->
det_diagnose_goal_2(Goal, GoalInfo, Desired, Actual, SwitchContext,
- DetInfo, Diagnosed, !IO)
+ DetInfo, Diagnosed, !Specs)
;
Diagnosed = no
).
@@ -502,20 +518,22 @@
:- pred det_diagnose_goal_2(hlds_goal_expr::in, hlds_goal_info::in,
determinism::in, determinism::in, list(switch_context)::in,
- det_info::in, bool::out, io::di, io::uo) is det.
+ det_info::in, bool::out,
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
det_diagnose_goal_2(conj(Goals), _GoalInfo, Desired, _Actual, Context, DetInfo,
- Diagnosed, !IO) :-
- det_diagnose_conj(Goals, Desired, Context, DetInfo, Diagnosed, !IO).
+ Diagnosed, !Specs) :-
+ det_diagnose_conj(Goals, Desired, Context, DetInfo, Diagnosed, !Specs).
det_diagnose_goal_2(par_conj(Goals), _GoalInfo, Desired, _Actual,
- Context, DetInfo, Diagnosed, !IO) :-
- det_diagnose_conj(Goals, Desired, Context, DetInfo, Diagnosed, !IO).
+ Context, DetInfo, Diagnosed, !Specs) :-
+ det_diagnose_conj(Goals, Desired, Context, DetInfo, Diagnosed, !Specs).
det_diagnose_goal_2(disj(Goals), GoalInfo, Desired, Actual, SwitchContext,
- DetInfo, Diagnosed, !IO) :-
+ DetInfo, Diagnosed, !Specs) :-
det_diagnose_disj(Goals, Desired, Actual, SwitchContext, DetInfo, 0,
- ClausesWithSoln, Diagnosed1, !IO),
+ ClausesWithSoln, Diagnosed1, !Specs),
determinism_components(Desired, _, DesSolns),
(
DesSolns \= at_most_many,
@@ -523,8 +541,9 @@
ClausesWithSoln > 1
->
goal_info_get_context(GoalInfo, Context),
- Msg = "Disjunction has multiple clauses with solutions.",
- write_error_pieces(Context, 2, [words(Msg)], !IO),
+ Pieces = [words("Disjunction has multiple clauses with solutions.")],
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs),
Diagnosed = yes
;
Diagnosed = Diagnosed1
@@ -536,14 +555,13 @@
% in switch_detection.m and handled via the CanFail field.
%
det_diagnose_goal_2(switch(Var, SwitchCanFail, Cases), GoalInfo,
- Desired, _Actual, SwitchContext, DetInfo, Diagnosed, !IO) :-
+ Desired, _Actual, SwitchContext, DetInfo, Diagnosed, !Specs) :-
(
SwitchCanFail = can_fail,
determinism_components(Desired, cannot_fail, _)
->
goal_info_get_context(GoalInfo, Context),
- det_diagnose_write_switch_context(Context, SwitchContext, DetInfo,
- yes, IsFirst, !IO),
+ det_diagnose_switch_context(Context, SwitchContext, DetInfo, !Specs),
det_get_proc_info(DetInfo, ProcInfo),
proc_info_varset(ProcInfo, VarSet),
det_info_get_module_info(DetInfo, ModuleInfo),
@@ -562,40 +580,40 @@
Pieces = [words("The switch on "), fixed(VarStr),
words("can fail.")]
),
- write_error_pieces_maybe_first_line(IsFirst, Context, 0, Pieces, !IO),
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs),
Diagnosed1 = yes
;
Diagnosed1 = no
),
det_diagnose_switch(Var, Cases, Desired, SwitchContext, DetInfo,
- Diagnosed2, !IO),
+ Diagnosed2, !Specs),
bool__or(Diagnosed1, Diagnosed2, Diagnosed).
-det_diagnose_goal_2(call(PredId, ModeId, _, _, CallContext, _), GoalInfo,
- Desired, Actual, _, DetInfo, yes, !IO) :-
+det_diagnose_goal_2(call(PredId, ProcId, _, _, CallContext, _), GoalInfo,
+ Desired, Actual, _, DetInfo, yes, !Specs) :-
goal_info_get_context(GoalInfo, Context),
- det_diagnose_atomic_goal(Desired, Actual,
- det_report_call_context(Context, CallContext, DetInfo, PredId, ModeId),
- Context, !IO).
+ det_report_call_context(Context, CallContext, DetInfo, PredId, ProcId,
+ InitSpecs, Spec),
+ det_diagnose_atomic_goal(Desired, Actual, InitSpecs, Spec, !Specs).
det_diagnose_goal_2(generic_call(GenericCall, _, _, _), GoalInfo,
- Desired, Actual, _, _DetInfo, yes, !IO) :-
+ Desired, Actual, _, _DetInfo, yes, !Specs) :-
goal_info_get_context(GoalInfo, Context),
- det_diagnose_atomic_goal(Desired, Actual,
- report_generic_call_context(Context, GenericCall),
- Context, !IO).
+ report_generic_call_context(Context, GenericCall, Spec),
+ det_diagnose_atomic_goal(Desired, Actual, [], Spec, !Specs).
det_diagnose_goal_2(unify(LHS, RHS, _, _, UnifyContext), GoalInfo,
- Desired, Actual, _, DetInfo, yes, !IO) :-
+ Desired, Actual, _, DetInfo, yes, !Specs) :-
goal_info_get_context(GoalInfo, Context),
- ( First = yes, Last = yes ),
- det_diagnose_atomic_goal(Desired, Actual,
+ First = yes,
+ Last = yes,
det_report_unify_context(First, Last, Context, UnifyContext,
- DetInfo, LHS, RHS),
- Context, !IO).
+ DetInfo, LHS, RHS, Spec),
+ det_diagnose_atomic_goal(Desired, Actual, [], Spec, !Specs).
det_diagnose_goal_2(if_then_else(_Vars, Cond, Then, Else), _GoalInfo,
- Desired, _Actual, SwitchContext, DetInfo, Diagnosed, !IO) :-
+ Desired, _Actual, SwitchContext, DetInfo, Diagnosed, !Specs) :-
determinism_components(Desired, _DesiredCanFail, DesiredSolns),
Cond = _CondGoal - CondInfo,
goal_info_get_determinism(CondInfo, CondDetism),
@@ -606,16 +624,19 @@
->
determinism_components(DesiredCond, can_fail, DesiredSolns),
det_diagnose_goal(Cond, DesiredCond, SwitchContext, DetInfo,
- Diagnosed1, !IO)
+ Diagnosed1, !Specs)
;
Diagnosed1 = no
),
- det_diagnose_goal(Then, Desired, SwitchContext, DetInfo, Diagnosed2, !IO),
- det_diagnose_goal(Else, Desired, SwitchContext, DetInfo, Diagnosed3, !IO),
+ det_diagnose_goal(Then, Desired, SwitchContext, DetInfo, Diagnosed2,
+ !Specs),
+ det_diagnose_goal(Else, Desired, SwitchContext, DetInfo, Diagnosed3,
+ !Specs),
bool__or(Diagnosed2, Diagnosed3, Diagnosed23),
bool__or(Diagnosed1, Diagnosed23, Diagnosed).
-det_diagnose_goal_2(not(_), GoalInfo, Desired, Actual, _, _, Diagnosed, !IO) :-
+det_diagnose_goal_2(not(_), GoalInfo, Desired, Actual, _, _, Diagnosed,
+ !Specs) :-
determinism_components(Desired, DesiredCanFail, DesiredSolns),
determinism_components(Actual, ActualCanFail, ActualSolns),
(
@@ -623,22 +644,25 @@
ActualCanFail = can_fail
->
goal_info_get_context(GoalInfo, Context),
- write_error_pieces(Context, 0, [words("Negated goal can succeed.")],
- !IO),
+ Pieces = [words("Negated goal can succeed.")],
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs),
Diagnosed = yes
;
DesiredSolns = at_most_zero,
ActualSolns \= at_most_zero
->
goal_info_get_context(GoalInfo, Context),
- write_error_pieces(Context, 0, [words("Negated goal can fail.")], !IO),
+ Pieces = [words("Negated goal can fail.")],
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs),
Diagnosed = yes
;
Diagnosed = no
).
det_diagnose_goal_2(scope(_, Goal), _, Desired, Actual,
- SwitchContext, DetInfo, Diagnosed, !IO) :-
+ SwitchContext, DetInfo, Diagnosed, !Specs) :-
Goal = _ - GoalInfo,
goal_info_get_determinism(GoalInfo, Internal),
( Actual = Internal ->
@@ -648,99 +672,110 @@
determinism_components(InternalDesired, CanFail, at_most_many)
),
det_diagnose_goal(Goal, InternalDesired, SwitchContext, DetInfo, Diagnosed,
- !IO).
+ !Specs).
det_diagnose_goal_2(foreign_proc(_, _, _, _, _, _), GoalInfo, Desired,
- _, _, _, yes, !IO) :-
+ _, _, _, yes, !Specs) :-
goal_info_get_context(GoalInfo, Context),
DesiredStr = determinism_to_string(Desired),
Pieces = [words("Determinism declaration not satisfied."),
words("Desired determinism is " ++ DesiredStr ++ ".")],
- write_error_pieces(Context, 0, Pieces, !IO).
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs).
-det_diagnose_goal_2(shorthand(_), _, _, _, _, _, _, !IO) :-
+det_diagnose_goal_2(shorthand(_), _, _, _, _, _, _, !Specs) :-
% These should have been expanded out by now.
error("det_diagnose_goal_2: unexpected shorthand").
%-----------------------------------------------------------------------------%
:- pred report_generic_call_context(prog_context::in, generic_call::in,
- io::di, io::uo) is det.
+ error_msg_spec::out(known_error_msg_spec)) is det.
-report_generic_call_context(Context, CallType, !IO) :-
+report_generic_call_context(Context, CallType, Spec) :-
hlds_goal__generic_call_id(CallType, CallId),
- write_error_pieces(Context, 0, [words(call_id_to_string(CallId))], !IO).
+ Pieces = [words(call_id_to_string(CallId))],
+ Spec = error_msg_spec(no, Context, 0, Pieces).
%-----------------------------------------------------------------------------%
:- pred det_diagnose_atomic_goal(determinism::in, determinism::in,
- pred(io, io)::in(pred(di, uo) is det), prog_context::in, io::di, io::uo)
- is det.
-
-det_diagnose_atomic_goal(Desired, Actual, WriteContext, Context) -->
- { determinism_components(Desired, DesiredCanFail, DesiredSolns) },
- { determinism_components(Actual, ActualCanFail, ActualSolns) },
- { compare_canfails(DesiredCanFail, ActualCanFail, CmpCanFail) },
- ( { CmpCanFail = tighter } ->
- call(WriteContext),
- io__write_string(" can fail.\n"),
- { Diagnosed1 = yes }
- ;
- { Diagnosed1 = no }
- ),
- { compare_solncounts(DesiredSolns, ActualSolns, CmpSolns) },
- ( { CmpSolns = tighter } ->
- call(WriteContext),
- io__write_string(" can succeed"),
- ( { DesiredSolns = at_most_one } ->
- io__write_string(" more than once.\n")
- ;
- io__write_string(".\n")
- ),
- { Diagnosed2 = yes }
- ;
- { Diagnosed2 = no }
- ),
- { bool__or(Diagnosed1, Diagnosed2, Diagnosed) },
- (
- { Diagnosed = yes }
- ;
- { Diagnosed = no },
- call(WriteContext),
- io__write_string(" has unknown determinism problem;\n"),
- prog_out__write_context(Context),
- io__write_string(" desired determinism is "),
- hlds_out__write_determinism(Desired),
- io__write_string(", while actual determinism is "),
- hlds_out__write_determinism(Actual),
- io__write_string(".\n")
- ).
+ list(error_msg_spec)::in(known_error_msg_specs),
+ error_msg_spec::in(known_error_msg_spec),
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
- % det_diagnose_conj is used for both normal [sequential]
- % conjunction and parallel conjunction.
+det_diagnose_atomic_goal(Desired, Actual, InitSpecs, !.CurSpec, !Specs) :-
+ determinism_components(Desired, DesiredCanFail, DesiredSolns),
+ determinism_components(Actual, ActualCanFail, ActualSolns),
+ compare_canfails(DesiredCanFail, ActualCanFail, CmpCanFail),
+ ( CmpCanFail = tighter ->
+ add_to_spec_at_end([words("can fail."), nl], !CurSpec),
+ Diagnosed1 = yes
+ ;
+ Diagnosed1 = no
+ ),
+ compare_solncounts(DesiredSolns, ActualSolns, CmpSolns),
+ ( CmpSolns = tighter ->
+ ( DesiredSolns = at_most_one ->
+ add_to_spec_at_end([words("can succeed more than once."), nl],
+ !CurSpec)
+ ;
+ add_to_spec_at_end([words("can succeed."), nl], !CurSpec)
+ ),
+ Diagnosed2 = yes
+ ;
+ Diagnosed2 = no
+ ),
+ bool__or(Diagnosed1, Diagnosed2, Diagnosed),
+ (
+ Diagnosed = yes
+ ;
+ Diagnosed = no,
+ Pieces = [words("has unknown determinism problem;"), nl,
+ words("desired determinism is" ++
+ determinism_to_string(Desired) ++ ","),
+ words("while actual determinism is" ++
+ determinism_to_string(Actual) ++ "."),
+ nl],
+ add_to_spec_at_end(Pieces, !CurSpec)
+ ),
+ inst_preserving_append(InitSpecs, [!.CurSpec], AllSpecs),
+ inst_preserving_append(!.Specs, AllSpecs, !:Specs).
+ % det_diagnose_conj is used for both normal [sequential] conjunction
+ % and parallel conjunction.
+ %
:- pred det_diagnose_conj(list(hlds_goal)::in, determinism::in,
- list(switch_context)::in, det_info::in, bool::out, io::di, io::uo)
- is det.
+ list(switch_context)::in, det_info::in, bool::out,
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
-det_diagnose_conj([], _Desired, _SwitchContext, _DetInfo, no, !IO).
+det_diagnose_conj([], _Desired, _SwitchContext, _DetInfo, no, !Specs).
det_diagnose_conj([Goal | Goals], Desired, SwitchContext, DetInfo,
- Diagnosed, !IO) :-
- det_diagnose_goal(Goal, Desired, SwitchContext, DetInfo, Diagnosed1, !IO),
- det_diagnose_conj(Goals, Desired, SwitchContext, DetInfo, Diagnosed2, !IO),
+ Diagnosed, !Specs) :-
+ det_diagnose_goal(Goal, Desired, SwitchContext, DetInfo, Diagnosed1,
+ !Specs),
+ det_diagnose_conj(Goals, Desired, SwitchContext, DetInfo, Diagnosed2,
+ !Specs),
bool__or(Diagnosed1, Diagnosed2, Diagnosed).
:- pred det_diagnose_disj(list(hlds_goal)::in,
determinism::in, determinism::in, list(switch_context)::in,
- det_info::in, int::in, int::out, bool::out, io::di, io::uo) is det.
+ det_info::in, int::in, int::out, bool::out,
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
det_diagnose_disj([], _Desired, _Actual, _SwitchContext, _DetInfo,
- !ClausesWithSoln, no, !IO).
+ !ClausesWithSoln, no, !Specs).
det_diagnose_disj([Goal | Goals], Desired, Actual, SwitchContext, DetInfo,
- !ClausesWithSoln, Diagnosed, !IO) :-
+ !ClausesWithSoln, Diagnosed, !Specs) :-
determinism_components(Actual, ActualCanFail, _),
determinism_components(Desired, DesiredCanFail, DesiredSolns),
- ( DesiredCanFail = cannot_fail, ActualCanFail = can_fail ->
+ (
+ DesiredCanFail = cannot_fail,
+ ActualCanFail = can_fail
+ ->
% if the disjunction was declared to never fail,
% but we inferred that it might fail, then we
% want to print an error message for every disjunct
@@ -755,7 +790,7 @@
),
determinism_components(ClauseDesired, ClauseCanFail, DesiredSolns),
det_diagnose_goal(Goal, ClauseDesired, SwitchContext, DetInfo,
- Diagnosed1, !IO),
+ Diagnosed1, !Specs),
(
Goal = _ - GoalInfo,
goal_info_get_determinism(GoalInfo, GoalDetism),
@@ -766,20 +801,22 @@
!:ClausesWithSoln = !.ClausesWithSoln + 1
),
det_diagnose_disj(Goals, Desired, Actual, SwitchContext, DetInfo,
- !ClausesWithSoln, Diagnosed2, !IO),
+ !ClausesWithSoln, Diagnosed2, !Specs),
bool__or(Diagnosed1, Diagnosed2, Diagnosed).
:- pred det_diagnose_switch(prog_var::in, list(case)::in, determinism::in,
list(switch_context)::in, det_info::in, bool::out,
- io::di, io::uo) is det.
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
-det_diagnose_switch(_Var, [], _Desired, _SwitchContext, _DetInfo, no, !IO).
+det_diagnose_switch(_Var, [], _Desired, _SwitchContext, _DetInfo, no, !Specs).
det_diagnose_switch(Var, [case(ConsId, Goal) | Cases], Desired,
- SwitchContext0, DetInfo, Diagnosed, !IO) :-
+ SwitchContext0, DetInfo, Diagnosed, !Specs) :-
SwitchContext1 = [switch_context(Var, ConsId) | SwitchContext0],
- det_diagnose_goal(Goal, Desired, SwitchContext1, DetInfo, Diagnosed1, !IO),
+ det_diagnose_goal(Goal, Desired, SwitchContext1, DetInfo, Diagnosed1,
+ !Specs),
det_diagnose_switch(Var, Cases, Desired, SwitchContext0, DetInfo,
- Diagnosed2, !IO),
+ Diagnosed2, !Specs),
bool__or(Diagnosed1, Diagnosed2, Diagnosed).
%-----------------------------------------------------------------------------%
@@ -822,13 +859,14 @@
:- type switch_context ---> switch_context(prog_var, cons_id).
-:- pred det_diagnose_write_switch_context(prog_context::in,
- list(switch_context)::in, det_info::in, bool::in, bool::out,
- io::di, io::uo) is det.
-
-det_diagnose_write_switch_context(_Context, [], _, !IsFirst, !IO).
-det_diagnose_write_switch_context(Context, [SwitchContext | SwitchContexts],
- DetInfo, !IsFirst, !IO) :-
+:- pred det_diagnose_switch_context(prog_context::in,
+ list(switch_context)::in, det_info::in,
+ list(error_msg_spec)::in(known_error_msg_specs),
+ list(error_msg_spec)::out(known_error_msg_specs)) is det.
+
+det_diagnose_switch_context(_Context, [], _, !Specs).
+det_diagnose_switch_context(Context, [SwitchContext | SwitchContexts],
+ DetInfo, !Specs) :-
det_get_proc_info(DetInfo, ProcInfo),
proc_info_varset(ProcInfo, VarSet),
SwitchContext = switch_context(Var, ConsId),
@@ -836,47 +874,45 @@
VarStr = mercury_var_to_string(Var, VarSet, no),
Pieces = [words("Inside the case"), fixed(ConsIdStr),
words("of the switch on"), fixed(VarStr), words(":")],
- write_error_pieces_maybe_first_line(!.IsFirst, Context, 0, Pieces, !IO),
- !:IsFirst = no,
- det_diagnose_write_switch_context(Context, SwitchContexts, DetInfo,
- !IsFirst, !IO).
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ inst_preserving_append(!.Specs, [Spec], !:Specs),
+ det_diagnose_switch_context(Context, SwitchContexts, DetInfo, !Specs).
%-----------------------------------------------------------------------------%
:- pred det_report_call_context(prog_context::in,
maybe(call_unify_context)::in, det_info::in, pred_id::in, proc_id::in,
- io::di, io::uo) is det.
+ list(error_msg_spec)::out(known_error_msg_specs),
+ error_msg_spec::out(known_error_msg_spec)) is det.
det_report_call_context(Context, CallUnifyContext, DetInfo, PredId, ProcId,
- !IO) :-
+ InitSpecs, Spec) :-
det_info_get_module_info(DetInfo, ModuleInfo),
module_info_pred_info(ModuleInfo, PredId, PredInfo),
- PredName = pred_info_name(PredInfo),
- PredOrFunc = pred_info_is_pred_or_func(PredInfo),
pred_info_get_origin(PredInfo, Origin),
- %
- % if the error was in a call to a type-specific unification predicate
+
+ % If the error was in a call to a type-specific unification predicate
% (i.e. in the unification itself), then don't print out the predicate
% name, just print out the context. If it wasn't, then print them
% both out. (The latter can happen if there is a determinism error
% in a function call inside some unification.)
- %
+
( Origin = special_pred(spec_pred_unify - _) ->
(
CallUnifyContext = yes(call_unify_context(LHS, RHS, UC)),
- First = yes, Last = yes,
+ First = yes,
+ Last = yes,
det_report_unify_context(First, Last, Context, UC, DetInfo,
- LHS, RHS, !IO)
+ LHS, RHS, Spec),
+ InitSpecs = []
;
- % this shouldn't happen; every call to a compiler
- % generated type-specific unification predicate
- % should have a unify_context
+ % This shouldn't happen; every call to a compiler generated
+ % type-specific unification predicate should have a unify_context.
CallUnifyContext = no,
- write_error_pieces(Context, 0,
- [words("Some weird unification"
- ++ "(or explicit call to a"
- ++ "type-specific unify predicate?)")],
- !IO)
+ Pieces = [words("Some weird unification"
+ ++ "(or explicit call to a type-specific unify predicate?)")],
+ Spec = error_msg_spec(no, Context, 0, Pieces),
+ InitSpecs = []
)
;
(
@@ -884,18 +920,21 @@
First = yes,
Last = no,
det_report_unify_context(First, Last, Context, UC, DetInfo,
- LHS, RHS, !IO),
- io__write_string(":\n", !IO)
+ LHS, RHS, UnifySpec0),
+ add_to_spec_at_end([suffix(":")], UnifySpec0, UnifySpec),
+ InitSpecs = [UnifySpec]
;
- CallUnifyContext = no
+ CallUnifyContext = no,
+ InitSpecs = []
),
pred_info_procedures(PredInfo, ProcTable),
map__lookup(ProcTable, ProcId, ProcInfo),
proc_info_declared_argmodes(ProcInfo, ArgModes),
- prog_out__write_context(Context, !IO),
- io__write_string(" call to `", !IO),
- report_pred_name_mode(PredOrFunc, PredName, ArgModes, !IO),
- io__write_string("'", !IO)
+ proc_info_inst_varset(ProcInfo, InstVarSet),
+ PredPieces = describe_one_pred_name_mode(ModuleInfo,
+ should_module_qualify, PredId, InstVarSet, ArgModes),
+ CallPieces = [words("call to") | PredPieces],
+ Spec = error_msg_spec(no, Context, 0, CallPieces)
).
%-----------------------------------------------------------------------------%
@@ -910,35 +949,31 @@
%
:- pred det_report_unify_context(bool::in, bool::in, prog_context::in,
unify_context::in, det_info::in, prog_var::in, unify_rhs::in,
- io::di, io::uo) is det.
+ error_msg_spec::out(known_error_msg_spec)) is det.
det_report_unify_context(!.First, Last, Context, UnifyContext, DetInfo,
- LHS, RHS, !IO) :-
- hlds_out__write_unify_context(!First, UnifyContext, Context, !IO),
- prog_out__write_context(Context, !IO),
+ LHS, RHS, Spec) :-
+ unify_context_to_pieces(!First, UnifyContext, [], UnifyContextPieces),
det_get_proc_info(DetInfo, ProcInfo),
proc_info_varset(ProcInfo, VarSet),
det_info_get_module_info(DetInfo, ModuleInfo),
- % We don't have the inst varset - it's not in the
- % proc_info, so we'll just make one up....
- varset__init(InstVarSet),
(
!.First = yes,
(
Last = yes,
- io__write_string(" Unification ", !IO)
+ StartWords = "Unification"
;
Last = no,
- io__write_string(" In unification ", !IO)
+ StartWords = "In unification"
)
;
!.First = no,
(
Last = yes,
- io__write_string(" unification ", !IO)
+ StartWords = "unification"
;
Last = no,
- io__write_string(" in unification ", !IO)
+ StartWords = "in unification"
)
),
( varset__search_name(VarSet, LHS, _) ->
@@ -946,27 +981,29 @@
RHS = var(RV),
\+ varset__search_name(VarSet, RV, _)
->
- io__write_string("with `", !IO),
- mercury_output_var(LHS, VarSet, no, !IO),
- io__write_string("'", !IO)
- ;
- io__write_string("of `", !IO),
- mercury_output_var(LHS, VarSet, no, !IO),
- io__write_string("' and `", !IO),
- hlds_out__write_unify_rhs(RHS, ModuleInfo, VarSet,
- InstVarSet, no, 3, !IO),
- io__write_string("'", !IO)
+ Pieces = [words(StartWords), words("with"),
+ words(add_quotes(mercury_var_to_string(LHS, VarSet, no)))]
+ ;
+ Pieces = [words(StartWords), words("of"),
+ words(add_quotes(mercury_var_to_string(LHS, VarSet, no))),
+ words("and"),
+ words(add_quotes(
+ unify_rhs_to_string(RHS, ModuleInfo, VarSet, no)))]
)
;
- io__write_string("with `", !IO),
- hlds_out__write_unify_rhs(RHS, ModuleInfo, VarSet, InstVarSet,
- no, 3, !IO),
- io__write_string("'", !IO)
- ).
+ Pieces = [words(StartWords), words("with"),
+ words(add_quotes(
+ unify_rhs_to_string(RHS, ModuleInfo, VarSet, no)))]
+ ),
+ AllPieces = UnifyContextPieces ++ Pieces,
+ Spec = error_msg_spec(no, Context, 0, AllPieces).
%-----------------------------------------------------------------------------%
-:- type det_msg_type ---> simple_code_warning ; call_warning ; error.
+:- type det_msg_type
+ ---> simple_code_warning
+ ; call_warning
+ ; det_error.
det_report_and_handle_msgs(Msgs, !ModuleInfo, !IO) :-
(
@@ -1024,7 +1061,7 @@
MsgType = call_warning,
!:WarnCnt = !.WarnCnt + 1
;
- MsgType = error,
+ MsgType = det_error,
!:ErrCnt = !.ErrCnt + 1
)
),
@@ -1049,18 +1086,19 @@
det_msg_get_type(warn_obsolete(_, _), simple_code_warning).
det_msg_get_type(warn_infinite_recursion(_), simple_code_warning).
det_msg_get_type(duplicate_call(_, _, _), call_warning).
-det_msg_get_type(cc_unify_can_fail(_, _, _, _, _), error).
-det_msg_get_type(cc_unify_in_wrong_context(_, _, _, _, _), error).
-det_msg_get_type(cc_pred_in_wrong_context(_, _, _, _), error).
-det_msg_get_type(higher_order_cc_pred_in_wrong_context(_, _), error).
-det_msg_get_type(error_in_lambda(_, _, _, _, _, _), error).
-det_msg_get_type(par_conj_not_det(_, _, _, _, _), error).
-det_msg_get_type(pragma_c_code_without_det_decl(_, _), error).
-det_msg_get_type(has_io_state_but_not_det(_, _), error).
-det_msg_get_type(will_not_throw_with_erroneous(_, _), error).
-det_msg_get_type(export_model_non_proc(_, _, _), error).
-det_msg_get_type(promise_equivalent_solutions_missing_vars(_, _, _), error).
-det_msg_get_type(promise_equivalent_solutions_extra_vars(_, _, _), error).
+det_msg_get_type(cc_unify_can_fail(_, _, _, _, _), det_error).
+det_msg_get_type(cc_unify_in_wrong_context(_, _, _, _, _, _), det_error).
+det_msg_get_type(cc_pred_in_wrong_context(_, _, _, _, _, _), det_error).
+det_msg_get_type(higher_order_cc_pred_in_wrong_context(_, _, _, _), det_error).
+det_msg_get_type(error_in_lambda(_, _, _, _, _, _), det_error).
+det_msg_get_type(par_conj_not_det(_, _, _, _, _), det_error).
+det_msg_get_type(pragma_c_code_without_det_decl(_, _), det_error).
+det_msg_get_type(has_io_state_but_not_det(_, _), det_error).
+det_msg_get_type(will_not_throw_with_erroneous(_, _), det_error).
+det_msg_get_type(export_model_non_proc(_, _, _), det_error).
+det_msg_get_type(promise_equivalent_solutions_missing_vars(_, _, _),
+ det_error).
+det_msg_get_type(promise_equivalent_solutions_extra_vars(_, _, _), det_error).
det_msg_is_any_mode_msg(multidet_disj(_, _), all_modes).
det_msg_is_any_mode_msg(det_disj(_, _), all_modes).
@@ -1077,9 +1115,10 @@
det_msg_is_any_mode_msg(warn_infinite_recursion(_), any_mode).
det_msg_is_any_mode_msg(duplicate_call(_, _, _), any_mode).
det_msg_is_any_mode_msg(cc_unify_can_fail(_, _, _, _, _), any_mode).
-det_msg_is_any_mode_msg(cc_unify_in_wrong_context(_, _, _, _, _), any_mode).
-det_msg_is_any_mode_msg(cc_pred_in_wrong_context(_, _, _, _), any_mode).
-det_msg_is_any_mode_msg(higher_order_cc_pred_in_wrong_context(_, _), any_mode).
+det_msg_is_any_mode_msg(cc_unify_in_wrong_context(_, _, _, _, _, _), any_mode).
+det_msg_is_any_mode_msg(cc_pred_in_wrong_context(_, _, _, _, _, _), any_mode).
+det_msg_is_any_mode_msg(higher_order_cc_pred_in_wrong_context(_, _, _, _),
+ any_mode).
det_msg_is_any_mode_msg(error_in_lambda(_, _, _, _, _, _), any_mode).
det_msg_is_any_mode_msg(par_conj_not_det(_, _, _, _, _), any_mode).
det_msg_is_any_mode_msg(pragma_c_code_without_det_decl(_, _), any_mode).
@@ -1246,7 +1285,7 @@
globals.io_set_extra_error_info(yes, !IO)
).
det_report_msg(cc_unify_in_wrong_context(GoalInfo, Var, Type, VarSet,
- GoalContext), _ModuleInfo, !IO) :-
+ GoalContext, FailingContexts), ModuleInfo, !IO) :-
goal_info_get_context(GoalInfo, Context),
(
GoalContext = switch,
@@ -1271,9 +1310,11 @@
Pieces1 = [words(ErrorMsg),
words("unification for non-canonical type"),
words("`" ++ TypeCtorStr ++ "'"),
- words("occurs in a context which requires all solutions.")],
- Pieces = Pieces0 ++ Pieces1,
- write_error_pieces(Context, 0, Pieces, !IO),
+ words("occurs in a context which requires all solutions."), nl],
+ FirstPieces = Pieces0 ++ Pieces1,
+ FirstSpec = error_msg_spec(yes, Context, 0, FirstPieces),
+ LaterSpecs = failing_contexts_description(ModuleInfo, VarSet,
+ FailingContexts),
globals__io_lookup_bool_option(verbose_errors, VerboseErrors, !IO),
(
VerboseErrors = yes,
@@ -1289,45 +1330,56 @@
words("representations, but I'm not going to do that"),
words("implicitly. (If that's really what you want,"),
words("you must do it explicitly.)")],
- write_error_pieces_not_first_line(Context, 0, VerbosePieces, !IO)
+ VerboseSpec = error_msg_spec(no, Context, 0, VerbosePieces),
+ write_error_specs([FirstSpec, VerboseSpec | LaterSpecs], !IO)
;
VerboseErrors = no,
- globals.io_set_extra_error_info(yes, !IO)
+ globals.io_set_extra_error_info(yes, !IO),
+ write_error_specs([FirstSpec | LaterSpecs], !IO)
).
-det_report_msg(cc_pred_in_wrong_context(GoalInfo, Detism, PredId, _ModeId),
- ModuleInfo, !IO) :-
+det_report_msg(cc_pred_in_wrong_context(GoalInfo, Detism, PredId, _ModeId,
+ VarSet, FailingContexts), ModuleInfo, !IO) :-
goal_info_get_context(GoalInfo, Context),
PredPieces = describe_one_pred_name(ModuleInfo,
should_not_module_qualify, PredId),
DetStr = mercury_det_to_string(Detism),
- Pieces = [words("Error: call to")] ++ PredPieces ++
+ FirstPieces = [words("Error: call to")] ++ PredPieces ++
[words("with determinism `" ++ DetStr ++ "'"),
- words("occurs in a context which requires all solutions.")],
- write_error_pieces(Context, 0, Pieces, !IO).
-det_report_msg(higher_order_cc_pred_in_wrong_context(GoalInfo, Detism),
- _ModuleInfo, !IO) :-
+ words("occurs in a context which requires all solutions."), nl],
+ FirstSpec = error_msg_spec(yes, Context, 0, FirstPieces),
+ LaterSpecs = failing_contexts_description(ModuleInfo, VarSet,
+ FailingContexts),
+ write_error_specs([FirstSpec | LaterSpecs], !IO).
+det_report_msg(higher_order_cc_pred_in_wrong_context(GoalInfo, Detism, VarSet,
+ FailingContexts), ModuleInfo, !IO) :-
goal_info_get_context(GoalInfo, Context),
DetStr = mercury_det_to_string(Detism),
- Pieces = [words("Error: higher-order call to predicate with"),
+ FirstPieces = [words("Error: higher-order call to predicate with"),
words("determinism `" ++ DetStr ++ "'"),
- words("occurs in a context which requires all solutions.")],
- write_error_pieces(Context, 0, Pieces, !IO).
+ words("occurs in a context which requires all solutions."), nl],
+ FirstSpec = error_msg_spec(yes, Context, 0, FirstPieces),
+ LaterSpecs = failing_contexts_description(ModuleInfo, VarSet,
+ FailingContexts),
+ write_error_specs([FirstSpec | LaterSpecs], !IO).
det_report_msg(error_in_lambda(DeclaredDetism, InferredDetism, Goal, GoalInfo,
PredId, ProcId), ModuleInfo, !IO) :-
PredPieces = describe_one_proc_name_mode(ModuleInfo,
should_not_module_qualify, proc(PredId, ProcId)),
goal_info_get_context(GoalInfo, Context),
- write_error_pieces(Context, 0,
+ Pieces =
[words("In")] ++ PredPieces ++ [suffix(":"), nl,
words("Determinism error in lambda expression."), nl,
words("Declared `" ++ determinism_to_string(DeclaredDetism)
++ "', inferred `" ++ determinism_to_string(InferredDetism)
- ++ "'.")], !IO),
+ ++ "'.")],
+ ReportSpec = error_msg_spec(no, Context, 0, Pieces),
globals__io_get_globals(Globals, !IO),
module_info_pred_proc_info(ModuleInfo, PredId, ProcId, _, ProcInfo),
proc_info_vartypes(ProcInfo, VarTypes),
det_info_init(ModuleInfo, VarTypes, PredId, ProcId, Globals, DetInfo),
- det_diagnose_goal(Goal, DeclaredDetism, [], DetInfo, _, !IO).
+ det_diagnose_goal(Goal, DeclaredDetism, [], DetInfo, _,
+ [ReportSpec], Specs),
+ write_error_specs(Specs, !IO).
det_report_msg(par_conj_not_det(InferredDetism, PredId,
ProcId, GoalInfo, Goals), ModuleInfo, !IO) :-
goal_info_get_context(GoalInfo, Context),
@@ -1341,12 +1393,13 @@
),
Rest = "The current implementation supports only single-solution"
++ "non-failing parallel conjunctions.",
- write_error_pieces(Context, 0, [words(First), words(Rest)], !IO),
+ ReportSpec = error_msg_spec(no, Context, 0, [words(First), words(Rest)]),
globals__io_get_globals(Globals, !IO),
module_info_pred_proc_info(ModuleInfo, PredId, ProcId, _, ProcInfo),
proc_info_vartypes(ProcInfo, VarTypes),
det_info_init(ModuleInfo, VarTypes, PredId, ProcId, Globals, DetInfo),
- det_diagnose_conj(Goals, det, [], DetInfo, _, !IO).
+ det_diagnose_conj(Goals, det, [], DetInfo, _, [ReportSpec], Specs),
+ write_error_specs(Specs, !IO).
det_report_msg(pragma_c_code_without_det_decl(PredId, ProcId),
ModuleInfo, !IO) :-
module_info_pred_proc_info(ModuleInfo, PredId, ProcId, _, ProcInfo),
@@ -1458,6 +1511,54 @@
get_exported_proc_context(Procs, PredId, ProcId, Context)
).
+:- func failing_contexts_description(module_info::in, prog_varset::in,
+ list(failing_context)::in) =
+ (list(error_msg_spec)::out(known_error_msg_specs)) is det.
+
+failing_contexts_description(ModuleInfo, VarSet, FailingContexts) =
+ list__map(failing_context_description(ModuleInfo, VarSet),
+ FailingContexts).
+
+:- func failing_context_description(module_info::in, prog_varset::in,
+ failing_context::in) = (error_msg_spec::out(known_error_msg_spec)) is det.
+
+failing_context_description(ModuleInfo, VarSet, Context - FailingGoal)
+ = Spec :-
+ (
+ FailingGoal = incomplete_switch(Var),
+ VarStr = mercury_var_to_string(Var, VarSet, no),
+ Pieces = [words("Switch on"), fixed(VarStr), words("is incomplete.")]
+ ;
+ FailingGoal = fail_goal,
+ Pieces = [words("Fail goal can fail.")]
+ ;
+ FailingGoal = test_goal(Var1, Var2),
+ Var1Str = mercury_var_to_string(Var1, VarSet, no),
+ Var2Str = mercury_var_to_string(Var2, VarSet, no),
+ Pieces = [words("Unification of"), fixed(Var1Str),
+ words("and"), fixed(Var2Str), words("can fail.")]
+ ;
+ FailingGoal = deconstruct_goal(Var, ConsId),
+ VarStr = mercury_var_to_string(Var, VarSet, no),
+ ConsIdStr = cons_id_to_string(ConsId),
+ Pieces = [words("Unification of"), fixed(VarStr),
+ words("with"), fixed(ConsIdStr), words("can fail.")]
+ ;
+ FailingGoal = call_goal(PredId, _ProcId),
+ module_info_pred_info(ModuleInfo, PredId, PredInfo),
+ Name = pred_info_name(PredInfo),
+ Pieces = [words("Call to"), fixed(Name), words("can fail.")]
+ ;
+ FailingGoal = generic_call_goal(GenericCall),
+ hlds_goal__generic_call_id(GenericCall, CallId),
+ Pieces = [words(capitalize(call_id_to_string(CallId))),
+ words("can fail.")]
+ ;
+ FailingGoal = negated_goal,
+ Pieces = [words("Negated goal can fail.")]
+ ),
+ Spec = error_msg_spec(no, Context, 0, Pieces ++ [nl]).
+
%-----------------------------------------------------------------------------%
:- func det_report_seen_call_id(module_info, seen_call_id)
@@ -1512,9 +1613,21 @@
].
restore_det_warnings(OptionsToRestore, !IO) :-
- list__foldl((pred((Option - Value)::in, di, uo) is det -->
- globals__io_set_option(Option, Value)
- ), OptionsToRestore, !IO).
+ list__foldl(restore_option, OptionsToRestore, !IO).
+
+:- pred restore_option(pair(option, option_data)::in, io::di, io::uo) is det.
+
+restore_option(Option - Value, !IO) :-
+ globals__io_set_option(Option, Value, !IO).
+
+%-----------------------------------------------------------------------------%
+
+:- pred inst_preserving_append(list(T)::in(list_skel(I)),
+ list(T)::in(list_skel(I)), list(T)::out(list_skel(I))) is det.
+
+inst_preserving_append([], L, L).
+inst_preserving_append([H | T], B, [H | NT]) :-
+ inst_preserving_append(T, B, NT).
%-----------------------------------------------------------------------------%
Index: compiler/det_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/det_util.m,v
retrieving revision 1.31
diff -u -b -r1.31 det_util.m
--- compiler/det_util.m 30 Sep 2005 08:08:18 -0000 1.31
+++ compiler/det_util.m 27 Oct 2005 14:31:18 -0000
@@ -18,13 +18,13 @@
:- interface.
-:- 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__globals.
-:- import_module parse_tree__prog_data.
+:- 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.globals.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -82,13 +82,13 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__type_util.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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 require.
Index: compiler/disj_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/disj_gen.m,v
retrieving revision 1.84
diff -u -b -r1.84 disj_gen.m
--- compiler/disj_gen.m 30 Aug 2005 04:11:49 -0000 1.84
+++ compiler/disj_gen.m 27 Oct 2005 14:31:18 -0000
@@ -19,10 +19,10 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
:- import_module list.
@@ -33,16 +33,16 @@
:- implementation.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module map.
Index: compiler/dnf.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dnf.m,v
retrieving revision 1.60
diff -u -b -r1.60 dnf.m
--- compiler/dnf.m 22 Jul 2005 12:31:53 -0000 1.60
+++ compiler/dnf.m 27 Oct 2005 14:31:18 -0000
@@ -45,8 +45,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module bool.
:- import_module list.
@@ -65,13 +65,13 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__dependency_graph.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.dependency_graph.
:- import_module bool.
:- import_module counter.
Index: compiler/dupelim.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dupelim.m,v
retrieving revision 1.71
diff -u -b -r1.71 dupelim.m
--- compiler/dupelim.m 19 Sep 2005 08:53:48 -0000 1.71
+++ compiler/dupelim.m 27 Oct 2005 14:31:18 -0000
@@ -45,8 +45,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module counter.
:- import_module list.
@@ -58,9 +58,9 @@
:- implementation.
-:- import_module ll_backend__basic_block.
-:- import_module ll_backend__opt_util.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
+:- import_module ll_backend.basic_block.
+:- import_module ll_backend.opt_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/dupproc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/dupproc.m,v
retrieving revision 1.5
diff -u -b -r1.5 dupproc.m
--- compiler/dupproc.m 12 Oct 2005 23:51:35 -0000 1.5
+++ compiler/dupproc.m 27 Oct 2005 14:31:18 -0000
@@ -21,8 +21,8 @@
:- interface.
% :- import_module hlds__hlds_pred.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module assoc_list.
:- import_module list.
@@ -36,7 +36,7 @@
:- implementation.
-:- import_module ll_backend__opt_util.
+:- import_module ll_backend.opt_util.
:- import_module int.
:- import_module require.
Index: compiler/equiv_type.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/equiv_type.m,v
retrieving revision 1.51
diff -u -b -r1.51 equiv_type.m
--- compiler/equiv_type.m 24 Oct 2005 04:14:00 -0000 1.51
+++ compiler/equiv_type.m 27 Oct 2005 14:31:18 -0000
@@ -15,8 +15,8 @@
:- module parse_tree__equiv_type.
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module recompilation.
:- import_module bool.
@@ -101,12 +101,13 @@
:- implementation.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/equiv_type_hlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/equiv_type_hlds.m,v
retrieving revision 1.21
diff -u -b -r1.21 equiv_type_hlds.m
--- compiler/equiv_type_hlds.m 24 Oct 2005 04:14:00 -0000 1.21
+++ compiler/equiv_type_hlds.m 27 Oct 2005 14:31:18 -0000
@@ -19,26 +19,26 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- pred replace_in_hlds(module_info::in, module_info::out) is det.
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__polymorphism.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_data.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__equiv_type.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_type.
+:- 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_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.equiv_type.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
:- import_module recompilation.
:- import_module bool.
Index: compiler/error_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/error_util.m,v
retrieving revision 1.43
diff -u -b -r1.43 error_util.m
--- compiler/error_util.m 30 Aug 2005 04:11:50 -0000 1.43
+++ compiler/error_util.m 27 Oct 2005 14:31:18 -0000
@@ -37,8 +37,8 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -200,7 +200,16 @@
;
anything(pred(di, uo) is det)
).
+:- inst known_error_msg_spec ==
+ bound(
+ error_msg_spec(ground, ground, ground, ground)
+ ).
:- inst error_msg_specs == list_skel(error_msg_spec).
+:- inst known_error_msg_specs == list_skel(known_error_msg_spec).
+
+:- pred add_to_spec_at_end(list(format_component)::in,
+ error_msg_spec::in(known_error_msg_spec),
+ error_msg_spec::out(known_error_msg_spec)) is det.
:- pred write_error_specs(list(error_msg_spec)::in(error_msg_specs),
io::di, io::uo) is det.
@@ -215,6 +224,11 @@
%
:- func add_quotes(string) = string.
+ % Ensure that the first character of the input string is not a lower case
+ % letter.
+ %
+:- func capitalize(string) = string.
+
% report_error_num_args(MaybePredOrFunc, Arity, CorrectArities).
%
% Write "wrong number of arguments (<Arity>; should be <CorrectArities>)",
@@ -224,40 +238,6 @@
:- pred report_error_num_args(maybe(pred_or_func)::in, int::in, list(int)::in,
io::di, io::uo) is det.
- % sorry(ModuleName, Message)
- % Call error/1 with a "Sorry, not implemented" message.
- %
- % Use this for features that should be implemented (or at
- % least could be implemented).
- %
-:- func sorry(string, string) = _ is erroneous.
-:- pred sorry(string::in, string::in) is erroneous.
-
- % unexpected(ModuleName, Message)
- % Call error/1 with an "Unexpected" message.
- %
- % Use this to handle cases which are not expected to arise (i.e.
- % bugs).
- %
-:- func unexpected(string, string) = _ is erroneous.
-:- pred unexpected(string::in, string::in) is erroneous.
-
- % Record the fact that a warning has been issued; set the exit status
- % to error if the --halt-at-warn option is set.
- %
-:- pred record_warning(io::di, io::uo) is det.
-
- % Report a warning, and set the exit status to error if the
- % --halt-at-warn option is set.
- %
-:- pred report_warning(string::in, io::di, io::uo) is det.
-
- % Report a warning to the specified stream, and set the exit status
- % to error if the --halt-at-warn option is set.
- %
-:- pred report_warning(io__output_stream::in, string::in, io::di, io::uo)
- is det.
-
% Report a warning, and set the exit status to error if the
% --halt-at-warn option is set.
%
@@ -266,19 +246,23 @@
:- implementation.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module char.
:- import_module int.
-:- import_module io.
:- import_module list.
-:- import_module require.
:- import_module string.
:- import_module term.
+add_to_spec_at_end(NewPieces, Spec0, Spec) :-
+ Spec0 = error_msg_spec(First, Context, ExtraIndent, Pieces0),
+ Pieces = Pieces0 ++ NewPieces,
+ Spec = error_msg_spec(First, Context, ExtraIndent, Pieces).
+
write_error_specs(Specs, !IO) :-
write_error_specs_2(Specs, yes, !IO).
@@ -790,6 +774,19 @@
add_quotes(Str) = "`" ++ Str ++ "'".
+capitalize(Str0) = Str :-
+ Chars0 = string.to_char_list(Str0),
+ (
+ Chars0 = [Char0 | TailChars],
+ char.is_lower(Char0),
+ Char = char.to_upper(Char0)
+ ->
+ Chars = [Char | TailChars],
+ Str = string.from_char_list(Chars)
+ ;
+ Str = Str0
+ ).
+
%-----------------------------------------------------------------------------%
report_error_num_args(MaybePredOrFunc, Arity0, Arities0, !IO) :-
@@ -827,36 +824,6 @@
io__write_string(", ", !IO)
),
report_error_right_num_args(Arities, !IO).
-
- % Call error/1 with a "Sorry, not implemented" message.
- %
-sorry(Module, What) = _ :- sorry(Module, What).
-sorry(Module, What) :-
- string__format("%s: Sorry, not implemented: %s",
- [s(Module), s(What)], ErrorMessage),
- error(ErrorMessage).
-
-unexpected(Module, What) = _ :- unexpected(Module, What).
-unexpected(Module, What) :-
- string__format("%s: Unexpected: %s", [s(Module), s(What)], ErrorMessage),
- error(ErrorMessage).
-
-record_warning(!IO) :-
- globals__io_lookup_bool_option(halt_at_warn, HaltAtWarn, !IO),
- (
- HaltAtWarn = yes,
- io__set_exit_status(1, !IO)
- ;
- HaltAtWarn = no
- ).
-
-report_warning(Message, !IO) :-
- record_warning(!IO),
- io__write_string(Message, !IO).
-
-report_warning(Stream, Message, !IO) :-
- record_warning(!IO),
- io__write_string(Stream, Message, !IO).
report_warning(Context, Indent, Components, !IO) :-
record_warning(!IO),
Index: compiler/exception_analysis.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/exception_analysis.m,v
retrieving revision 1.14
diff -u -b -r1.14 exception_analysis.m
--- compiler/exception_analysis.m 24 Oct 2005 04:14:00 -0000 1.14
+++ compiler/exception_analysis.m 27 Oct 2005 14:31:18 -0000
@@ -104,16 +104,16 @@
:- import_module hlds.make_hlds.
:- import_module hlds.passes_aux.
:- import_module hlds.special_pred.
+:- 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 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_out.
-:- import_module parse_tree.prog_util.
:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module transform_hlds.dependency_graph.
:- import_module bool.
Index: compiler/export.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/export.m,v
retrieving revision 1.91
diff -u -b -r1.91 export.m
--- compiler/export.m 24 Oct 2005 04:14:00 -0000 1.91
+++ compiler/export.m 27 Oct 2005 14:31:18 -0000
@@ -20,10 +20,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
+:- import_module hlds.hlds_module.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
:- import_module io.
@@ -77,20 +77,20 @@
:- implementation.
-:- 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.
-:- import_module hlds__arg_info.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_util.
+:- 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.
+:- import_module hlds.arg_info.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_pred.
+:- 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.
:- import_module bool.
Index: compiler/exprn_aux.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/exprn_aux.m,v
retrieving revision 1.63
diff -u -b -r1.63 exprn_aux.m
--- compiler/exprn_aux.m 24 Oct 2005 04:14:00 -0000 1.63
+++ compiler/exprn_aux.m 27 Oct 2005 14:31:18 -0000
@@ -10,9 +10,9 @@
:- interface.
-:- import_module libs__options.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module libs.options.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
@@ -101,9 +101,9 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module getopt_io.
:- import_module int.
Index: compiler/fact_table.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/fact_table.m,v
retrieving revision 1.67
diff -u -b -r1.67 fact_table.m
--- compiler/fact_table.m 24 Oct 2005 04:14:00 -0000 1.67
+++ compiler/fact_table.m 27 Oct 2005 14:31:18 -0000
@@ -50,10 +50,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -89,35 +89,30 @@
:- implementation.
-% Parse tree modules
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-% HLDS modules
-:- import_module hlds__arg_info.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
-:- import_module hlds__passes_aux.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__inst_match.
-% LLDS back-end modules
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__llds_out.
-% Modules shared between different back-ends.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__export.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__foreign.
-% Misc
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.export.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- 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.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.llds_out.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
-% Standard library modules
:- import_module assoc_list.
:- import_module bool.
:- import_module char.
Index: compiler/field_access.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/field_access.m,v
retrieving revision 1.2
diff -u -b -r1.2 field_access.m
--- compiler/field_access.m 24 Oct 2005 04:14:01 -0000 1.2
+++ compiler/field_access.m 27 Oct 2005 14:31:18 -0000
@@ -11,12 +11,12 @@
:- module hlds__make_hlds__field_access.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_hlds__state_var.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_hlds.state_var.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module assoc_list.
:- import_module io.
@@ -85,10 +85,10 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__superhomogeneous.
-:- import_module parse_tree__prog_io.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.superhomogeneous.
+:- import_module parse_tree.prog_io.
:- import_module bool.
:- import_module int.
Index: compiler/follow_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/follow_code.m,v
retrieving revision 1.76
diff -u -b -r1.76 follow_code.m
--- compiler/follow_code.m 24 Oct 2005 04:14:01 -0000 1.76
+++ compiler/follow_code.m 27 Oct 2005 14:31:18 -0000
@@ -31,9 +31,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module list.
@@ -50,14 +50,14 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module map.
Index: compiler/follow_vars.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/follow_vars.m,v
retrieving revision 1.76
diff -u -b -r1.76 follow_vars.m
--- compiler/follow_vars.m 24 Oct 2005 04:14:01 -0000 1.76
+++ compiler/follow_vars.m 27 Oct 2005 14:31:18 -0000
@@ -30,10 +30,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- pred find_final_follow_vars(proc_info::in, abs_follow_vars_map::out,
int::out) is det.
@@ -48,16 +48,16 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__arg_info.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module ll_backend__call_gen.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.arg_info.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module ll_backend.call_gen.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/foreign.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/foreign.m,v
retrieving revision 1.52
diff -u -b -r1.52 foreign.m
--- compiler/foreign.m 24 Oct 2005 04:14:01 -0000 1.52
+++ compiler/foreign.m 27 Oct 2005 14:31:18 -0000
@@ -20,13 +20,13 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
:- import_module bool.
:- import_module io.
@@ -150,20 +150,21 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- 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__globals.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.name_mangle.
+:- 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.compiler_util.
+:- import_module libs.globals.
+:- import_module parse_tree.error_util.
+:- 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/frameopt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/frameopt.m,v
retrieving revision 1.93
diff -u -b -r1.93 frameopt.m
--- compiler/frameopt.m 9 Sep 2005 02:43:09 -0000 1.93
+++ compiler/frameopt.m 27 Oct 2005 14:31:18 -0000
@@ -93,9 +93,9 @@
:- interface.
-:- import_module libs__globals.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module libs.globals.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module counter.
@@ -149,13 +149,13 @@
:- implementation.
-:- import_module libs__options.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__livemap.
-:- import_module ll_backend__opt_debug.
-:- import_module ll_backend__opt_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.livemap.
+:- import_module ll_backend.opt_debug.
+:- import_module ll_backend.opt_util.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module int.
Index: compiler/global_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/global_data.m,v
retrieving revision 1.10
diff -u -b -r1.10 global_data.m
--- compiler/global_data.m 12 Oct 2005 23:51:35 -0000 1.10
+++ compiler/global_data.m 27 Oct 2005 14:31:18 -0000
@@ -16,11 +16,11 @@
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data. % for module_name
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data. % for module_name
:- import_module assoc_list.
:- import_module bool.
@@ -88,10 +88,10 @@
:- implementation.
-:- import_module backend_libs__rtti.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds_out.
-:- import_module parse_tree__error_util.
+:- import_module backend_libs.rtti.
+:- import_module libs.compiler_util.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds_out.
:- import_module counter.
:- import_module int.
Index: compiler/globals.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/globals.m,v
retrieving revision 1.70
diff -u -b -r1.70 globals.m
--- compiler/globals.m 28 Sep 2005 09:02:13 -0000 1.70
+++ compiler/globals.m 27 Oct 2005 14:31:18 -0000
@@ -19,10 +19,10 @@
:- interface.
-:- import_module libs__options.
-:- import_module libs__trace_params.
+:- import_module libs.options.
+:- import_module libs.trace_params.
:- import_module mdbcomp.
-:- import_module mdbcomp__prim_data. % for module_name
+:- import_module mdbcomp.prim_data. % for module_name
:- import_module bool.
:- import_module getopt_io.
Index: compiler/goal_form.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/goal_form.m,v
retrieving revision 1.18
diff -u -b -r1.18 goal_form.m
--- compiler/goal_form.m 30 Sep 2005 08:08:20 -0000 1.18
+++ compiler/goal_form.m 27 Oct 2005 14:31:18 -0000
@@ -17,9 +17,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module list.
@@ -110,11 +110,11 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__term_constr_main.
-:- import_module transform_hlds__term_util.
+:- import_module hlds.hlds_data.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_util.
:- import_module bool.
:- import_module int.
Index: compiler/goal_path.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/goal_path.m,v
retrieving revision 1.26
diff -u -b -r1.26 goal_path.m
--- compiler/goal_path.m 30 Aug 2005 04:11:50 -0000 1.26
+++ compiler/goal_path.m 27 Oct 2005 14:31:18 -0000
@@ -15,9 +15,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module bool.
@@ -47,11 +47,11 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
:- import_module char.
:- import_module int.
Index: compiler/goal_store.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/goal_store.m,v
retrieving revision 1.6
diff -u -b -r1.6 goal_store.m
--- compiler/goal_store.m 12 Oct 2005 23:51:35 -0000 1.6
+++ compiler/goal_store.m 27 Oct 2005 14:31:18 -0000
@@ -19,10 +19,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
:- import_module bool.
:- import_module set.
@@ -51,7 +51,7 @@
:- implementation.
-:- import_module hlds__goal_util.
+:- import_module hlds.goal_util.
:- import_module int.
:- import_module list.
Index: compiler/goal_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/goal_util.m,v
retrieving revision 1.117
diff -u -b -r1.117 goal_util.m
--- compiler/goal_util.m 24 Oct 2005 04:14:01 -0000 1.117
+++ compiler/goal_util.m 27 Oct 2005 14:31:18 -0000
@@ -16,12 +16,12 @@
:- module hlds__goal_util.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
@@ -312,19 +312,19 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- 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 parse_tree.prog_util.
:- import_module int.
:- import_module require.
Index: compiler/graph_colour.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/graph_colour.m,v
retrieving revision 1.15
diff -u -b -r1.15 graph_colour.m
--- compiler/graph_colour.m 24 Oct 2005 04:14:02 -0000 1.15
+++ compiler/graph_colour.m 27 Oct 2005 14:31:18 -0000
@@ -29,8 +29,7 @@
:- implementation.
-:- import_module parse_tree.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
:- import_module list.
:- import_module require.
Index: compiler/handle_options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/handle_options.m,v
retrieving revision 1.241
diff -u -b -r1.241 handle_options.m
--- compiler/handle_options.m 25 Oct 2005 10:17:26 -0000 1.241
+++ compiler/handle_options.m 27 Oct 2005 14:31:18 -0000
@@ -20,8 +20,8 @@
:- interface.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module bool.
:- import_module getopt_io.
@@ -75,10 +75,11 @@
:- implementation.
-:- import_module libs__trace_params.
+:- import_module libs.compiler_util.
+:- import_module libs.trace_params.
:- import_module parse_tree.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_io_util.
:- import_module char.
:- import_module dir.
Index: compiler/hhf.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hhf.m,v
retrieving revision 1.11
diff -u -b -r1.11 hhf.m
--- compiler/hhf.m 24 Oct 2005 04:14:02 -0000 1.11
+++ compiler/hhf.m 27 Oct 2005 14:31:18 -0000
@@ -16,9 +16,9 @@
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
-:- import_module hlds__inst_graph.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.inst_graph.
:- import_module bool.
:- import_module io.
@@ -31,15 +31,15 @@
:- implementation.
-:- import_module parse_tree__prog_data.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module list.
:- import_module map.
Index: compiler/higher_order.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/higher_order.m,v
retrieving revision 1.141
diff -u -b -r1.141 higher_order.m
--- compiler/higher_order.m 24 Oct 2005 04:14:02 -0000 1.141
+++ compiler/higher_order.m 27 Oct 2005 14:31:18 -0000
@@ -54,16 +54,16 @@
:- import_module hlds.passes_aux.
:- import_module hlds.quantification.
:- import_module hlds.special_pred.
+:- 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_data.
:- import_module parse_tree.prog_mode.
:- import_module parse_tree.prog_out.
-:- import_module parse_tree.prog_util.
:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module transform_hlds.inlining.
:- import_module assoc_list.
Index: compiler/hlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds.m,v
retrieving revision 1.218
diff -u -b -r1.218 hlds.m
--- compiler/hlds.m 12 Oct 2005 23:51:35 -0000 1.218
+++ compiler/hlds.m 27 Oct 2005 14:31:18 -0000
@@ -51,7 +51,7 @@
:- implementation.
:- import_module libs.
-:- import_module check_hlds. % needed for unify_proc__unify_proc_id, etc
+:- import_module check_hlds. % needed for unify_proc.unify_proc_id, etc
:- import_module transform_hlds. % needed for term_util, mmc_analysis
:- end_module hlds.
Index: compiler/hlds_code_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_code_util.m,v
retrieving revision 1.21
diff -u -b -r1.21 hlds_code_util.m
--- compiler/hlds_code_util.m 24 Oct 2005 04:14:03 -0000 1.21
+++ compiler/hlds_code_util.m 27 Oct 2005 14:31:19 -0000
@@ -18,9 +18,9 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -41,15 +41,15 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module char.
Index: compiler/hlds_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_data.m,v
retrieving revision 1.98
diff -u -b -r1.98 hlds_data.m
--- compiler/hlds_data.m 24 Oct 2005 04:14:03 -0000 1.98
+++ compiler/hlds_data.m 27 Oct 2005 14:31:19 -0000
@@ -15,10 +15,10 @@
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_goal.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -28,8 +28,8 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module parse_tree.prog_type.
:- import_module int.
:- import_module svmulti_map.
Index: compiler/hlds_error_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_error_util.m,v
retrieving revision 1.12
diff -u -b -r1.12 hlds_error_util.m
--- compiler/hlds_error_util.m 24 Oct 2005 04:14:03 -0000 1.12
+++ compiler/hlds_error_util.m 27 Oct 2005 14:31:19 -0000
@@ -19,10 +19,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__error_util.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.error_util.
:- import_module assoc_list.
:- import_module list.
@@ -63,13 +63,13 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__special_pred.
-:- 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_util.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.special_pred.
+:- 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_util.
:- import_module int.
:- import_module string.
Index: compiler/hlds_goal.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_goal.m,v
retrieving revision 1.141
diff -u -b -r1.141 hlds_goal.m
--- compiler/hlds_goal.m 24 Oct 2005 04:14:03 -0000 1.141
+++ compiler/hlds_goal.m 27 Oct 2005 14:31:19 -0000
@@ -16,12 +16,12 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module char.
@@ -1388,13 +1388,13 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__type_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module map.
Index: compiler/hlds_llds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_llds.m,v
retrieving revision 1.8
diff -u -b -r1.8 hlds_llds.m
--- compiler/hlds_llds.m 30 Aug 2005 04:11:52 -0000 1.8
+++ compiler/hlds_llds.m 27 Oct 2005 14:31:19 -0000
@@ -15,8 +15,8 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module map.
@@ -273,7 +273,7 @@
:- implementation.
-:- import_module hlds__goal_util.
+:- import_module hlds.goal_util.
:- import_module assoc_list.
:- import_module list.
Index: compiler/hlds_module.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_module.m,v
retrieving revision 1.121
diff -u -b -r1.121 hlds_module.m
--- compiler/hlds_module.m 24 Oct 2005 04:14:03 -0000 1.121
+++ compiler/hlds_module.m 27 Oct 2005 14:31:19 -0000
@@ -24,15 +24,15 @@
:- interface.
:- import_module analysis.
-:- import_module check_hlds__unify_proc.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
+:- import_module check_hlds.unify_proc.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
:- import_module recompilation.
:- import_module list.
@@ -44,12 +44,12 @@
:- implementation.
-:- import_module check_hlds__typecheck.
-:- import_module hlds__hlds_out.
-:- import_module transform_hlds__mmc_analysis.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.typecheck.
+:- import_module hlds.hlds_out.
+:- import_module transform_hlds.mmc_analysis.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
@@ -574,9 +574,10 @@
:- implementation.
+:- import_module libs.compiler_util.
+
:- import_module assoc_list.
:- import_module counter.
-:- import_module parse_tree__error_util.
:- pred module_info_get_lambdas_per_context(module_info::in,
map(prog_context, counter)::out) is det.
Index: compiler/hlds_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_out.m,v
retrieving revision 1.374
diff -u -b -r1.374 hlds_out.m
--- compiler/hlds_out.m 24 Oct 2005 04:14:04 -0000 1.374
+++ compiler/hlds_out.m 27 Oct 2005 14:31:19 -0000
@@ -34,18 +34,15 @@
:- interface.
-% Parse tree modules
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-% HLDS modules
-:- import_module hlds__hlds_data.
+:- 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__instmap.
-% mdbcomp modules.
-:- import_module mdbcomp__prim_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -201,6 +198,14 @@
:- pred write_unify_rhs(unify_rhs::in, module_info::in, prog_varset::in,
inst_varset::in, bool::in, int::in, io::di, io::uo) is det.
+ % Converts the right-hand-side of a unification to a string, similarly to
+ % write_unify_rhs, but doesn't print any details for lambda goals.
+ % The module_info and the varset give the context of the rhs. The boolean
+ % says whether variables should have their numbers appended to them.
+ %
+:- func unify_rhs_to_string(unify_rhs, module_info, prog_varset, bool)
+ = string.
+
% Print out a list of variables and their corresponding modes
% (e.g. for a lambda expressions). The varsets gives the context.
% The boolean says whether variables should have their numbers
@@ -258,27 +263,22 @@
:- implementation.
-% Parse tree modules.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-
-% HLDS modules.
-:- import_module check_hlds__check_typeclass.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__instmap.
-:- import_module hlds__special_pred.
-
-% Misc
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module check_hlds.check_typeclass.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.instmap.
+:- import_module hlds.special_pred.
+:- 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_io_util.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
-% Standard library modules
:- import_module assoc_list.
:- import_module getopt_io.
:- import_module int.
@@ -2470,18 +2470,18 @@
)
).
-write_unify_rhs(Rhs, ModuleInfo, VarSet, InstVarSet, AppendVarNums, Indent,
+write_unify_rhs(RHS, ModuleInfo, VarSet, InstVarSet, AppendVarNums, Indent,
!IO) :-
- write_unify_rhs_3(Rhs, ModuleInfo, VarSet, InstVarSet, AppendVarNums,
+ write_unify_rhs_3(RHS, ModuleInfo, VarSet, InstVarSet, AppendVarNums,
Indent, no, no, !IO).
:- pred write_unify_rhs_2(unify_rhs::in, module_info::in,
prog_varset::in, inst_varset::in, bool::in, int::in, string::in,
maybe(mer_type)::in, maybe_vartypes::in, io::di, io::uo) is det.
-write_unify_rhs_2(Rhs, ModuleInfo, VarSet, InstVarSet, AppendVarNums, Indent,
+write_unify_rhs_2(RHS, ModuleInfo, VarSet, InstVarSet, AppendVarNums, Indent,
Follow, MaybeType, TypeQual, !IO) :-
- write_unify_rhs_3(Rhs, ModuleInfo, VarSet, InstVarSet, AppendVarNums,
+ write_unify_rhs_3(RHS, ModuleInfo, VarSet, InstVarSet, AppendVarNums,
Indent, MaybeType, TypeQual, !IO),
io__write_string(Follow, !IO).
@@ -2513,7 +2513,6 @@
;
true
).
-
write_unify_rhs_3(lambda_goal(Purity, PredOrFunc, EvalMethod, _, NonLocals,
Vars, Modes, Det, Goal), ModuleInfo, VarSet, InstVarSet, AppendVarNums,
Indent, MaybeType, TypeQual, !IO) :-
@@ -2596,6 +2595,24 @@
;
true
).
+
+unify_rhs_to_string(var(Var), _ModuleInfo, VarSet, AppendVarNums)
+ = mercury_var_to_string(Var, VarSet, AppendVarNums).
+unify_rhs_to_string(functor(ConsId0, IsExistConstruct, ArgVars), ModuleInfo,
+ VarSet, AppendVarNums) = Str :-
+ (
+ IsExistConstruct = yes,
+ ConsId0 = cons(SymName0, Arity)
+ ->
+ remove_new_prefix(SymName, SymName0),
+ ConsId = cons(SymName, Arity)
+ ;
+ ConsId = ConsId0
+ ),
+ Str = functor_cons_id_to_string(ConsId, ArgVars, VarSet, ModuleInfo,
+ AppendVarNums).
+unify_rhs_to_string(lambda_goal(_, _, _, _, _, _, _, _, _), _, _, _)
+ = "lambda goal".
:- pred write_sym_name_and_args(sym_name::in, list(prog_var)::in,
prog_varset::in, bool::in, io::di, io::uo) is det.
Index: compiler/hlds_pred.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_pred.m,v
retrieving revision 1.183
diff -u -b -r1.183 hlds_pred.m
--- compiler/hlds_pred.m 24 Oct 2005 04:14:04 -0000 1.183
+++ compiler/hlds_pred.m 27 Oct 2005 14:31:19 -0000
@@ -15,21 +15,21 @@
:- interface.
-:- import_module check_hlds__mode_constraint_robdd.
-:- import_module check_hlds__mode_errors.
-:- import_module check_hlds__mode_errors.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__inst_graph.
-:- import_module hlds__special_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__term_constr_main.
-:- import_module transform_hlds__term_util.
+:- import_module check_hlds.mode_constraint_robdd.
+:- import_module check_hlds.mode_errors.
+:- import_module check_hlds.mode_errors.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.inst_graph.
+:- import_module hlds.special_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_util.
:- import_module assoc_list.
:- import_module bool.
@@ -40,21 +40,16 @@
:- implementation.
-% Parse tree modules.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
-
-% HLDS modules.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_form.
-:- import_module hlds__goal_util.
-:- import_module hlds__make_hlds.
-
-% Misc
-:- import_module libs__options.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_form.
+:- import_module hlds.goal_util.
+:- import_module hlds.make_hlds.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
% Standard library modules.
:- import_module int.
@@ -2833,7 +2828,7 @@
is semidet.
:- implementation.
-:- import_module check_hlds__mode_errors.
+:- import_module check_hlds.mode_errors.
:- type proc_info --->
proc_info(
@@ -3637,8 +3632,8 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__special_pred.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.special_pred.
pred_info_is_builtin(PredInfo) :-
ModuleName = pred_info_module(PredInfo),
@@ -3837,7 +3832,7 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
+:- import_module check_hlds.det_analysis.
valid_determinism_for_eval_method(eval_normal, _) = yes.
valid_determinism_for_eval_method(eval_loop_check, Detism) = Valid :-
Index: compiler/il_peephole.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/il_peephole.m,v
retrieving revision 1.13
diff -u -b -r1.13 il_peephole.m
--- compiler/il_peephole.m 24 Oct 2005 04:14:05 -0000 1.13
+++ compiler/il_peephole.m 27 Oct 2005 14:31:19 -0000
@@ -36,7 +36,7 @@
:- interface.
-:- import_module ml_backend__ilasm.
+:- import_module ml_backend.ilasm.
:- import_module bool.
:- import_module list.
@@ -53,7 +53,7 @@
:- type instrs == list(instr).
-:- import_module ml_backend__ilds.
+:- import_module ml_backend.ilds.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/ilasm.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ilasm.m,v
retrieving revision 1.42
diff -u -b -r1.42 ilasm.m
--- compiler/ilasm.m 24 Oct 2005 04:14:05 -0000 1.42
+++ compiler/ilasm.m 27 Oct 2005 14:31:19 -0000
@@ -24,7 +24,7 @@
:- interface.
-:- import_module ml_backend__ilds.
+:- import_module ml_backend.ilds.
:- import_module bool.
:- import_module integer.
@@ -276,10 +276,10 @@
:- implementation.
-:- import_module backend_libs__c_util. % for output_float_literal
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
+:- import_module backend_libs.c_util. % for output_float_literal
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module bool.
:- import_module char.
Index: compiler/ilds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ilds.m,v
retrieving revision 1.20
diff -u -b -r1.20 ilds.m
--- compiler/ilds.m 24 Oct 2005 04:14:05 -0000 1.20
+++ compiler/ilds.m 27 Oct 2005 14:31:19 -0000
@@ -409,7 +409,7 @@
:- implementation.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
:- import_module int.
:- import_module require.
Index: compiler/inlining.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/inlining.m,v
retrieving revision 1.129
diff -u -b -r1.129 inlining.m
--- compiler/inlining.m 24 Oct 2005 04:14:05 -0000 1.129
+++ compiler/inlining.m 27 Oct 2005 14:31:19 -0000
@@ -80,10 +80,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -145,26 +145,26 @@
:- implementation.
% Parse tree modules
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
% HLDS modules
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module transform_hlds__complexity.
-:- import_module transform_hlds__dead_proc_elim.
-:- import_module transform_hlds__dependency_graph.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module transform_hlds.complexity.
+:- import_module transform_hlds.dead_proc_elim.
+:- import_module transform_hlds.dependency_graph.
% Misc
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module mdbcomp__prim_data.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module mdbcomp.prim_data.
% Standard library modules
:- import_module assoc_list.
Index: compiler/inst_graph.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/inst_graph.m,v
retrieving revision 1.6
diff -u -b -r1.6 inst_graph.m
--- compiler/inst_graph.m 12 Oct 2005 23:51:36 -0000 1.6
+++ compiler/inst_graph.m 27 Oct 2005 14:31:19 -0000
@@ -16,7 +16,7 @@
:- module hlds__inst_graph.
:- interface.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -180,8 +180,8 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
:- import_module require.
:- import_module set.
Index: compiler/inst_match.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/inst_match.m,v
retrieving revision 1.68
diff -u -b -r1.68 inst_match.m
--- compiler/inst_match.m 24 Oct 2005 04:14:06 -0000 1.68
+++ compiler/inst_match.m 27 Oct 2005 14:31:19 -0000
@@ -307,8 +307,8 @@
:- import_module check_hlds.mode_util.
:- import_module check_hlds.type_util.
:- import_module hlds.hlds_data.
+:- import_module libs.compiler_util.
:- import_module mdbcomp.prim_data.
-:- import_module parse_tree.error_util.
:- import_module parse_tree.prog_data.
:- import_module bool.
Index: compiler/inst_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/inst_util.m,v
retrieving revision 1.41
diff -u -b -r1.41 inst_util.m
--- compiler/inst_util.m 24 Oct 2005 04:14:06 -0000 1.41
+++ compiler/inst_util.m 27 Oct 2005 14:31:19 -0000
@@ -40,8 +40,8 @@
:- module check_hlds__inst_util.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -134,13 +134,13 @@
:- 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 parse_tree__prog_mode.
+:- 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 parse_tree.prog_mode.
:- import_module int.
:- import_module list.
Index: compiler/instmap.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/instmap.m,v
retrieving revision 1.44
diff -u -b -r1.44 instmap.m
--- compiler/instmap.m 24 Oct 2005 04:14:06 -0000 1.44
+++ compiler/instmap.m 27 Oct 2005 14:31:19 -0000
@@ -22,11 +22,11 @@
:- interface.
-:- import_module check_hlds__mode_errors.
-:- import_module check_hlds__mode_info.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_errors.
+:- import_module check_hlds.mode_info.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
@@ -312,13 +312,13 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__inst_util.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.inst_util.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module parse_tree.prog_data.
:- import_module int.
:- import_module require.
Index: compiler/intermod.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/intermod.m,v
retrieving revision 1.182
diff -u -b -r1.182 intermod.m
--- compiler/intermod.m 24 Oct 2005 04:14:06 -0000 1.182
+++ compiler/intermod.m 27 Oct 2005 14:31:19 -0000
@@ -39,10 +39,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io.
:- import_module bool.
:- import_module io.
@@ -95,28 +95,28 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__foreign.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__typecheck.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- 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_io.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__inlining.
+:- import_module backend_libs.foreign.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module check_hlds.typecheck.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.special_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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_io.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.inlining.
:- import_module assoc_list.
:- import_module dir.
Index: compiler/interval.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/interval.m,v
retrieving revision 1.9
diff -u -b -r1.9 interval.m
--- compiler/interval.m 24 Oct 2005 04:14:07 -0000 1.9
+++ compiler/interval.m 27 Oct 2005 14:31:19 -0000
@@ -34,10 +34,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module counter.
@@ -174,26 +174,26 @@
:- implementation.
-:- 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__globals.
-:- import_module libs__options.
+:- 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.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__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_type.
+:- 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 require.
Index: compiler/ite_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ite_gen.m,v
retrieving revision 1.81
diff -u -b -r1.81 ite_gen.m
--- compiler/ite_gen.m 12 Sep 2005 05:24:10 -0000 1.81
+++ compiler/ite_gen.m 27 Oct 2005 14:31:19 -0000
@@ -20,10 +20,10 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
:- pred ite_gen__generate_ite(code_model::in, hlds_goal::in, hlds_goal::in,
hlds_goal::in, hlds_goal_info::in, code_tree::out,
@@ -36,17 +36,17 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
Index: compiler/java_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/java_util.m,v
retrieving revision 1.14
diff -u -b -r1.14 java_util.m
--- compiler/java_util.m 24 Oct 2005 04:14:07 -0000 1.14
+++ compiler/java_util.m 27 Oct 2005 14:31:19 -0000
@@ -18,7 +18,7 @@
:- module ml_backend__java_util.
:- interface.
-:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs.builtin_ops.
:- import_module string.
@@ -67,7 +67,7 @@
:- implementation.
-:- import_module parse_tree__error_util.
+:- import_module parse_tree.error_util.
:- import_module list.
Index: compiler/jumpopt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/jumpopt.m,v
retrieving revision 1.82
diff -u -b -r1.82 jumpopt.m
--- compiler/jumpopt.m 24 Oct 2005 04:14:07 -0000 1.82
+++ compiler/jumpopt.m 27 Oct 2005 14:31:19 -0000
@@ -16,8 +16,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module counter.
@@ -59,9 +59,9 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__opt_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.opt_util.
:- import_module int.
:- import_module map.
Index: compiler/labelopt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/labelopt.m,v
retrieving revision 1.26
diff -u -b -r1.26 labelopt.m
--- compiler/labelopt.m 6 Oct 2005 01:03:14 -0000 1.26
+++ compiler/labelopt.m 27 Oct 2005 14:31:19 -0000
@@ -16,7 +16,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module bool.
:- import_module list.
@@ -41,7 +41,7 @@
:- implementation.
-:- import_module ll_backend__opt_util.
+:- import_module ll_backend.opt_util.
:- import_module std_util.
Index: compiler/lambda.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/lambda.m,v
retrieving revision 1.106
diff -u -b -r1.106 lambda.m
--- compiler/lambda.m 24 Oct 2005 04:14:07 -0000 1.106
+++ compiler/lambda.m 27 Oct 2005 14:31:19 -0000
@@ -71,8 +71,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- pred process_module(module_info::in, module_info::out) is det.
@@ -83,29 +83,23 @@
:- implementation.
-% Parse tree modules
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
-
-% HLDS modules
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__quantification.
-
-% Misc
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
-% Standard library modules
:- import_module bool.
:- import_module list.
:- import_module map.
Index: compiler/layout.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/layout.m,v
retrieving revision 1.21
diff -u -b -r1.21 layout.m
--- compiler/layout.m 12 Oct 2005 23:51:36 -0000 1.21
+++ compiler/layout.m 27 Oct 2005 14:31:19 -0000
@@ -34,11 +34,11 @@
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module libs__trace_params.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_pred.
+:- import_module libs.trace_params.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/layout_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/layout_out.m,v
retrieving revision 1.55
diff -u -b -r1.55 layout_out.m
--- compiler/layout_out.m 24 Oct 2005 04:14:07 -0000 1.55
+++ compiler/layout_out.m 27 Oct 2005 14:31:19 -0000
@@ -23,10 +23,10 @@
:- interface.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__llds_out.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.llds_out.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module io.
@@ -93,22 +93,22 @@
:- implementation.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module ll_backend__code_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__mercury_to_mercury.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.code_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module char.
:- import_module int.
Index: compiler/lco.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/lco.m,v
retrieving revision 1.27
diff -u -b -r1.27 lco.m
--- compiler/lco.m 24 Oct 2005 04:14:08 -0000 1.27
+++ compiler/lco.m 27 Oct 2005 14:31:19 -0000
@@ -105,7 +105,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- pred lco_modulo_constructors(module_info::in, module_info::out) is det.
@@ -114,23 +114,23 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__arg_info.
-:- 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__instmap.
-:- import_module hlds__quantification.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module transform_hlds__dependency_graph.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.arg_info.
+:- 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.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module transform_hlds.dependency_graph.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module assoc_list.
:- import_module bag.
Index: compiler/libs.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/libs.m,v
retrieving revision 1.6
diff -u -b -r1.6 libs.m
--- compiler/libs.m 12 Oct 2005 23:51:36 -0000 1.6
+++ compiler/libs.m 27 Oct 2005 14:31:19 -0000
@@ -12,19 +12,22 @@
:- module libs.
:- interface.
-% option handling
+% Option handling.
:- include_module globals.
:- include_module handle_options.
:- include_module options.
:- include_module trace_params.
-% generic algorithms and data structures that are not
-% quite useful enough to go in the standard library
+% Error handling.
+:- include_module compiler_util.
+
+% Generic algorithms and data structures that are not quite useful enough
+% to go in the standard library.
:- include_module atsort.
:- include_module graph_colour.
:- include_module tree.
-% OS interfaces not provided by the standard library
+% OS interfaces not provided by the standard library.
:- include_module process_util.
:- include_module timestamp.
Index: compiler/live_vars.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/live_vars.m,v
retrieving revision 1.112
diff -u -b -r1.112 live_vars.m
--- compiler/live_vars.m 13 Sep 2005 04:56:06 -0000 1.112
+++ compiler/live_vars.m 27 Oct 2005 14:31:19 -0000
@@ -25,13 +25,13 @@
:- interface.
% Parse tree modules
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
% HLDS modules
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
% Standard library modules
:- import_module bool.
@@ -64,15 +64,15 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__arg_info.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__instmap.
-:- import_module ll_backend__liveness.
-:- import_module ll_backend__llds.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.arg_info.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.instmap.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.llds.
:- import_module assoc_list.
:- import_module int.
Index: compiler/livemap.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/livemap.m,v
retrieving revision 1.69
diff -u -b -r1.69 livemap.m
--- compiler/livemap.m 5 Oct 2005 06:33:40 -0000 1.69
+++ compiler/livemap.m 27 Oct 2005 14:31:19 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module list.
:- import_module map.
@@ -37,8 +37,8 @@
:- implementation.
-:- import_module parse_tree__error_util.
-:- import_module ll_backend__opt_util.
+:- import_module libs.compiler_util.
+:- import_module ll_backend.opt_util.
:- import_module bool.
:- import_module require.
Index: compiler/liveness.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/liveness.m,v
retrieving revision 1.138
diff -u -b -r1.138 liveness.m
--- compiler/liveness.m 24 Oct 2005 04:14:08 -0000 1.138
+++ compiler/liveness.m 27 Oct 2005 14:31:19 -0000
@@ -157,9 +157,9 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module set.
@@ -180,34 +180,26 @@
:- implementation.
-% Parse tree modules
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-
-% HLDS modules
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module hlds__arg_info.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-
-% LLDS modules
-:- import_module ll_backend__llds.
-:- import_module ll_backend__trace.
-
-% Misc
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module hlds.arg_info.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_util.
-% Standard library modules
:- import_module assoc_list.
:- import_module bool.
:- import_module list.
Index: compiler/ll_pseudo_type_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ll_pseudo_type_info.m,v
retrieving revision 1.14
diff -u -b -r1.14 ll_pseudo_type_info.m
--- compiler/ll_pseudo_type_info.m 24 Oct 2005 04:14:08 -0000 1.14
+++ compiler/ll_pseudo_type_info.m 27 Oct 2005 14:31:19 -0000
@@ -25,9 +25,9 @@
:- interface.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
% construct_typed_pseudo_type_info(Type, NumUnivQTvars, ExistQVars,
% Rval, LldsType):
@@ -58,8 +58,8 @@
:- implementation.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__rtti.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.rtti.
:- import_module bool.
:- import_module int.
Index: compiler/llds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/llds.m,v
retrieving revision 1.321
diff -u -b -r1.321 llds.m
--- compiler/llds.m 24 Oct 2005 04:14:08 -0000 1.321
+++ compiler/llds.m 27 Oct 2005 14:31:19 -0000
@@ -18,17 +18,17 @@
:- interface.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__rtti.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_pred.
-:- import_module libs__tree.
-:- import_module ll_backend__layout.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.rtti.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_pred.
+:- import_module libs.tree.
+:- import_module ll_backend.layout.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
:- import_module bool.
:- import_module list.
Index: compiler/llds_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/llds_out.m,v
retrieving revision 1.264
diff -u -b -r1.264 llds_out.m
--- compiler/llds_out.m 24 Oct 2005 04:14:08 -0000 1.264
+++ compiler/llds_out.m 27 Oct 2005 14:31:19 -0000
@@ -19,15 +19,15 @@
:- interface.
-:- import_module aditi_backend__rl_file.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module libs__globals.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl_file.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module libs.globals.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module io.
@@ -180,29 +180,29 @@
:- implementation.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__compile_target_code.
-:- import_module backend_libs__export.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__layout_out.
-:- import_module ll_backend__pragma_c_gen.
-:- import_module ll_backend__rtti_out.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.compile_target_code.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.export.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.layout_out.
+:- import_module ll_backend.pragma_c_gen.
+:- import_module ll_backend.rtti_out.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bintree_set.
Index: compiler/lookup_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/lookup_switch.m,v
retrieving revision 1.57
diff -u -b -r1.57 lookup_switch.m
--- compiler/lookup_switch.m 24 Oct 2005 04:14:09 -0000 1.57
+++ compiler/lookup_switch.m 27 Oct 2005 14:31:19 -0000
@@ -42,14 +42,14 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module map.
@@ -77,19 +77,19 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__dense_switch.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__global_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.dense_switch.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.global_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/loop_inv.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/loop_inv.m,v
retrieving revision 1.24
diff -u -b -r1.24 loop_inv.m
--- compiler/loop_inv.m 24 Oct 2005 04:14:09 -0000 1.24
+++ compiler/loop_inv.m 27 Oct 2005 14:31:19 -0000
@@ -99,8 +99,8 @@
:- interface.
:- import_module hlds.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
% hoist_loop_invariants(PredId, ProcId, PredInfo,
% ProcInfo0, ProcInfo, ModuleInfo0, ModuleInfo)
@@ -119,18 +119,18 @@
:- implementation.
:- import_module check_hlds.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/magic.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/magic.m,v
retrieving revision 1.59
diff -u -b -r1.59 magic.m
--- compiler/magic.m 24 Oct 2005 04:14:09 -0000 1.59
+++ compiler/magic.m 27 Oct 2005 14:31:19 -0000
@@ -163,7 +163,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -174,34 +174,34 @@
:- implementation.
-:- import_module aditi_backend__aditi_builtin_ops.
-:- import_module aditi_backend__context.
-:- import_module aditi_backend__magic_util.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_gen.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__simplify.
-:- 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_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module aditi_backend.aditi_builtin_ops.
+:- import_module aditi_backend.context.
+:- import_module aditi_backend.magic_util.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_gen.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.simplify.
+:- 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_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module ll_backend.
-:- import_module ll_backend__saved_vars.
-:- import_module mdbcomp__prim_data.
-:- 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 transform_hlds__dead_proc_elim.
-:- import_module transform_hlds__dependency_graph.
+:- import_module ll_backend.saved_vars.
+:- import_module mdbcomp.prim_data.
+:- 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 transform_hlds.dead_proc_elim.
+:- import_module transform_hlds.dependency_graph.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/magic_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/magic_util.m,v
retrieving revision 1.55
diff -u -b -r1.55 magic_util.m
--- compiler/magic_util.m 24 Oct 2005 04:14:09 -0000 1.55
+++ compiler/magic_util.m 27 Oct 2005 14:31:19 -0000
@@ -14,11 +14,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -128,19 +128,19 @@
:- implementation.
-:- 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_error_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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_error_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module int.
Index: compiler/make.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.m,v
retrieving revision 1.28
diff -u -b -r1.28 make.m
--- compiler/make.m 26 Apr 2005 04:32:48 -0000 1.28
+++ compiler/make.m 27 Oct 2005 14:31:19 -0000
@@ -25,12 +25,12 @@
:- include_module make__options_file.
:- include_module make__util.
-:- import_module make__options_file.
+:- import_module make.options_file.
:- import_module mdbcomp.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module parse_tree.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_io.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_io.
:- import_module io.
:- import_module list.
@@ -64,25 +64,25 @@
:- import_module backend_libs.
:- import_module top_level. % XXX unwanted dependency
-:- import_module make__dependencies.
-:- import_module make__module_dep_file.
-:- import_module make__module_target.
-:- import_module make__program_target.
-:- import_module make__util.
-
-:- import_module backend_libs__compile_target_code.
-:- import_module libs__globals.
-:- import_module libs__handle_options.
-:- import_module libs__options.
-:- import_module libs__process_util.
-:- import_module libs__timestamp.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module top_level__mercury_compile. % XXX unwanted dependency
+:- import_module make.dependencies.
+:- import_module make.module_dep_file.
+:- import_module make.module_target.
+:- import_module make.program_target.
+:- import_module make.util.
+
+:- import_module backend_libs.compile_target_code.
+:- import_module libs.globals.
+:- import_module libs.handle_options.
+:- import_module libs.options.
+:- import_module libs.process_util.
+:- import_module libs.timestamp.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_out.
+:- import_module top_level.mercury_compile. % XXX unwanted dependency
:- import_module assoc_list.
:- import_module bool.
Index: compiler/make.module_dep_file.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.module_dep_file.m,v
retrieving revision 1.14
diff -u -b -r1.14 make.module_dep_file.m
--- compiler/make.module_dep_file.m 24 Oct 2005 04:14:10 -0000 1.14
+++ compiler/make.module_dep_file.m 27 Oct 2005 14:31:19 -0000
@@ -16,7 +16,7 @@
:- interface.
-:- import_module parse_tree__modules.
+:- import_module parse_tree.modules.
:- import_module io.
:- import_module std_util.
Index: compiler/make.module_target.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.module_target.m,v
retrieving revision 1.32
diff -u -b -r1.32 make.module_target.m
--- compiler/make.module_target.m 27 Apr 2005 03:19:19 -0000 1.32
+++ compiler/make.module_target.m 27 Oct 2005 14:31:19 -0000
@@ -59,7 +59,8 @@
:- implementation.
-:- import_module hlds__passes_aux.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
%-----------------------------------------------------------------------------%
Index: compiler/make.program_target.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.program_target.m,v
retrieving revision 1.32
diff -u -b -r1.32 make.program_target.m
--- compiler/make.program_target.m 25 Oct 2005 10:17:27 -0000 1.32
+++ compiler/make.program_target.m 27 Oct 2005 14:31:19 -0000
@@ -40,7 +40,8 @@
:- implementation.
-:- import_module hlds__passes_aux.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
%-----------------------------------------------------------------------------%
Index: compiler/make_hlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_hlds.m,v
retrieving revision 1.518
diff -u -b -r1.518 make_hlds.m
--- compiler/make_hlds.m 24 Oct 2005 04:14:10 -0000 1.518
+++ compiler/make_hlds.m 27 Oct 2005 14:31:19 -0000
@@ -24,13 +24,13 @@
:- module hlds__make_hlds.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__equiv_type.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.equiv_type.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -120,11 +120,11 @@
:- include_module state_var.
:- include_module superhomogeneous.
-:- import_module hlds__make_hlds__add_class.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__make_hlds__add_special_pred.
-:- import_module hlds__make_hlds__make_hlds_passes.
-:- import_module hlds__make_hlds__qual_info.
+:- import_module hlds.make_hlds.add_class.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.make_hlds.add_special_pred.
+:- import_module hlds.make_hlds.make_hlds_passes.
+:- import_module hlds.make_hlds.qual_info.
:- type make_hlds_qual_info == hlds__make_hlds__qual_info__qual_info.
Index: compiler/make_hlds_error.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_hlds_error.m,v
retrieving revision 1.4
diff -u -b -r1.4 make_hlds_error.m
--- compiler/make_hlds_error.m 24 Oct 2005 04:14:11 -0000 1.4
+++ compiler/make_hlds_error.m 27 Oct 2005 14:31:19 -0000
@@ -17,10 +17,10 @@
:- module hlds__make_hlds__make_hlds_error.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -70,14 +70,14 @@
:- implementation.
-:- import_module check_hlds__mode_errors.
-:- import_module hlds__hlds_out.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- 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 check_hlds.mode_errors.
+:- import_module hlds.hlds_out.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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 std_util.
:- import_module string.
Index: compiler/make_hlds_passes.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_hlds_passes.m,v
retrieving revision 1.18
diff -u -b -r1.18 make_hlds_passes.m
--- compiler/make_hlds_passes.m 25 Oct 2005 06:32:58 -0000 1.18
+++ compiler/make_hlds_passes.m 27 Oct 2005 14:31:19 -0000
@@ -9,13 +9,13 @@
:- module hlds__make_hlds__make_hlds_passes.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__equiv_type.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.equiv_type.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -97,31 +97,32 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
-:- import_module hlds__make_hlds__add_class.
-:- import_module hlds__make_hlds__add_clause.
-:- import_module hlds__make_hlds__add_mode.
-:- import_module hlds__make_hlds__add_pragma.
-:- import_module hlds__make_hlds__add_pred.
-:- import_module hlds__make_hlds__add_solver.
-:- import_module hlds__make_hlds__add_special_pred.
-:- import_module hlds__make_hlds__add_type.
-:- import_module hlds__make_hlds__make_hlds_error.
-:- import_module hlds__make_hlds__make_hlds_warn.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_mutable.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.clause_to_proc.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.make_hlds.add_class.
+:- import_module hlds.make_hlds.add_clause.
+:- import_module hlds.make_hlds.add_mode.
+:- import_module hlds.make_hlds.add_pragma.
+:- import_module hlds.make_hlds.add_pred.
+:- import_module hlds.make_hlds.add_solver.
+:- import_module hlds.make_hlds.add_special_pred.
+:- import_module hlds.make_hlds.add_type.
+:- import_module hlds.make_hlds.make_hlds_error.
+:- import_module hlds.make_hlds.make_hlds_warn.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_mutable.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module recompilation.
:- import_module int.
Index: compiler/make_hlds_warn.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_hlds_warn.m,v
retrieving revision 1.4
diff -u -b -r1.4 make_hlds_warn.m
--- compiler/make_hlds_warn.m 24 Oct 2005 04:14:11 -0000 1.4
+++ compiler/make_hlds_warn.m 27 Oct 2005 14:31:19 -0000
@@ -11,11 +11,11 @@
:- module hlds__make_hlds__make_hlds_warn.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -53,13 +53,14 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module libs__options.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_out.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_out.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_out.
+:- 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_out.
:- import_module bool.
:- import_module char.
Index: compiler/make_tags.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_tags.m,v
retrieving revision 1.48
diff -u -b -r1.48 make_tags.m
--- compiler/make_tags.m 5 Oct 2005 06:33:42 -0000 1.48
+++ compiler/make_tags.m 27 Oct 2005 14:31:19 -0000
@@ -60,9 +60,9 @@
:- module hlds__make_tags.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module libs__globals.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module libs.globals.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -85,11 +85,11 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_util.
:- import_module int.
:- import_module map.
Index: compiler/mark_static_terms.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mark_static_terms.m,v
retrieving revision 1.17
diff -u -b -r1.17 mark_static_terms.m
--- compiler/mark_static_terms.m 12 Oct 2005 01:27:50 -0000 1.17
+++ compiler/mark_static_terms.m 27 Oct 2005 14:31:19 -0000
@@ -20,8 +20,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- pred mark_static_terms(module_info::in, proc_info::in, proc_info::out)
is det.
@@ -30,10 +30,10 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module int.
Index: compiler/matching.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/matching.m,v
retrieving revision 1.5
diff -u -b -r1.5 matching.m
--- compiler/matching.m 12 Oct 2005 23:51:37 -0000 1.5
+++ compiler/matching.m 27 Oct 2005 14:31:19 -0000
@@ -19,7 +19,7 @@
:- interface.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
Index: compiler/maybe_mlds_to_gcc.pp
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/maybe_mlds_to_gcc.pp,v
retrieving revision 1.9
diff -u -b -r1.9 maybe_mlds_to_gcc.pp
--- compiler/maybe_mlds_to_gcc.pp 22 Mar 2005 06:40:07 -0000 1.9
+++ compiler/maybe_mlds_to_gcc.pp 27 Oct 2005 15:34:23 -0000
@@ -17,8 +17,8 @@
:- module ml_backend__maybe_mlds_to_gcc.
:- interface.
-:- import_module aditi_backend__rl_file.
-:- import_module ml_backend__mlds.
+:- import_module aditi_backend.rl_file.
+:- import_module ml_backend.mlds.
:- import_module bool.
:- import_module std_util.
@@ -57,7 +57,7 @@
#else
-:- import_module parse_tree__prog_out.
+:- import_module parse_tree.prog_out.
:- import_module string.
maybe_mlds_to_gcc__run_gcc_backend(_ModuleName, CallBack, CallBackOutput) -->
Index: compiler/mercury_compile.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mercury_compile.m,v
retrieving revision 1.356
diff -u -b -r1.356 mercury_compile.m
--- compiler/mercury_compile.m 25 Oct 2005 06:32:58 -0000 1.356
+++ compiler/mercury_compile.m 27 Oct 2005 14:31:19 -0000
@@ -42,143 +42,144 @@
%
% semantic analysis
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__source_file_map.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__equiv_type.
-:- import_module hlds__make_hlds.
-:- import_module check_hlds__typecheck.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__modes.
-:- import_module check_hlds__mode_constraints.
-:- import_module check_hlds__switch_detection.
-:- import_module check_hlds__cse_detection.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__unique_modes.
-:- import_module check_hlds__stratify.
-:- import_module check_hlds__simplify.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.source_file_map.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.equiv_type.
+:- import_module hlds.make_hlds.
+:- import_module check_hlds.typecheck.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.modes.
+:- import_module check_hlds.mode_constraints.
+:- import_module check_hlds.switch_detection.
+:- import_module check_hlds.cse_detection.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.unique_modes.
+:- import_module check_hlds.stratify.
+:- import_module check_hlds.simplify.
% high-level HLDS transformations
-:- import_module check_hlds__check_typeclass.
-:- import_module transform_hlds__intermod.
-:- import_module transform_hlds__trans_opt.
-:- import_module transform_hlds__equiv_type_hlds.
-:- import_module transform_hlds__table_gen.
-:- import_module transform_hlds__complexity.
-:- import_module transform_hlds__lambda.
-:- import_module transform_hlds__closure_analysis.
-:- import_module transform_hlds__termination.
-:- import_module transform_hlds__term_constr_main.
-:- import_module transform_hlds__exception_analysis.
-:- import_module transform_hlds__higher_order.
-:- import_module transform_hlds__accumulator.
-:- import_module transform_hlds__tupling.
-:- import_module transform_hlds__untupling.
-:- import_module transform_hlds__inlining.
-:- import_module transform_hlds__loop_inv.
-:- import_module transform_hlds__deforest.
-:- import_module aditi_backend__aditi_builtin_ops.
-:- import_module aditi_backend__dnf.
-:- import_module aditi_backend__magic.
-:- import_module transform_hlds__dead_proc_elim.
-:- import_module transform_hlds__delay_construct.
-:- import_module transform_hlds__unused_args.
-:- import_module transform_hlds__unneeded_code.
-:- import_module transform_hlds__lco.
-:- import_module transform_hlds__size_prof.
-:- import_module ll_backend__deep_profiling.
+:- import_module check_hlds.check_typeclass.
+:- import_module transform_hlds.intermod.
+:- import_module transform_hlds.trans_opt.
+:- import_module transform_hlds.equiv_type_hlds.
+:- import_module transform_hlds.table_gen.
+:- import_module transform_hlds.complexity.
+:- import_module transform_hlds.lambda.
+:- import_module transform_hlds.closure_analysis.
+:- import_module transform_hlds.termination.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.exception_analysis.
+:- import_module transform_hlds.higher_order.
+:- import_module transform_hlds.accumulator.
+:- import_module transform_hlds.tupling.
+:- import_module transform_hlds.untupling.
+:- import_module transform_hlds.inlining.
+:- import_module transform_hlds.loop_inv.
+:- import_module transform_hlds.deforest.
+:- import_module aditi_backend.aditi_builtin_ops.
+:- import_module aditi_backend.dnf.
+:- import_module aditi_backend.magic.
+:- import_module transform_hlds.dead_proc_elim.
+:- import_module transform_hlds.delay_construct.
+:- import_module transform_hlds.unused_args.
+:- import_module transform_hlds.unneeded_code.
+:- import_module transform_hlds.lco.
+:- import_module transform_hlds.size_prof.
+:- import_module ll_backend.deep_profiling.
% the LLDS back-end
-:- import_module ll_backend__saved_vars.
-:- import_module ll_backend__stack_opt.
-:- import_module ll_backend__stack_alloc.
-:- import_module ll_backend__follow_code.
-:- import_module ll_backend__liveness.
-:- import_module ll_backend__live_vars.
-:- import_module ll_backend__store_alloc.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__optimize.
-:- import_module ll_backend__transform_llds.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__stack_layout.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__dupproc.
+:- import_module ll_backend.saved_vars.
+:- import_module ll_backend.stack_opt.
+:- import_module ll_backend.stack_alloc.
+:- import_module ll_backend.follow_code.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.live_vars.
+:- import_module ll_backend.store_alloc.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.optimize.
+:- import_module ll_backend.transform_llds.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.stack_layout.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.dupproc.
% the Aditi-RL back-end
-:- import_module aditi_backend__rl_gen.
-:- import_module aditi_backend__rl_opt.
-:- import_module aditi_backend__rl_out.
+:- import_module aditi_backend.rl_gen.
+:- import_module aditi_backend.rl_opt.
+:- import_module aditi_backend.rl_out.
% the bytecode back-end
-:- import_module bytecode_backend__bytecode_gen.
-:- import_module bytecode_backend__bytecode.
+:- import_module bytecode_backend.bytecode_gen.
+:- import_module bytecode_backend.bytecode.
% the MLDS back-end
-:- import_module ml_backend__add_trail_ops. % HLDS -> HLDS
-:- import_module ml_backend__add_heap_ops. % HLDS -> HLDS
-:- import_module ml_backend__mark_static_terms. % HLDS -> HLDS
-:- import_module ml_backend__mlds. % MLDS data structure
-:- import_module ml_backend__ml_code_gen.
-:- import_module ml_backend__rtti_to_mlds. % HLDS/RTTI -> MLDS
-:- import_module ml_backend__ml_elim_nested. % MLDS -> MLDS
-:- import_module ml_backend__ml_tailcall. % MLDS -> MLDS
-:- import_module ml_backend__ml_optimize. % MLDS -> MLDS
-:- import_module ml_backend__mlds_to_c. % MLDS -> C
-:- import_module ml_backend__mlds_to_java. % MLDS -> Java
-:- import_module ml_backend__mlds_to_ilasm. % MLDS -> IL assembler
-:- import_module ml_backend__maybe_mlds_to_gcc. % MLDS -> GCC back-end
-:- import_module ml_backend__ml_util. % MLDS utility predicates
+:- import_module ml_backend.add_trail_ops. % HLDS -> HLDS
+:- import_module ml_backend.add_heap_ops. % HLDS -> HLDS
+:- import_module ml_backend.mark_static_terms. % HLDS -> HLDS
+:- import_module ml_backend.mlds. % MLDS data structure
+:- import_module ml_backend.ml_code_gen.
+:- import_module ml_backend.rtti_to_mlds. % HLDS/RTTI -> MLDS
+:- import_module ml_backend.ml_elim_nested. % MLDS -> MLDS
+:- import_module ml_backend.ml_tailcall. % MLDS -> MLDS
+:- import_module ml_backend.ml_optimize. % MLDS -> MLDS
+:- import_module ml_backend.mlds_to_c. % MLDS -> C
+:- import_module ml_backend.mlds_to_java. % MLDS -> Java
+:- import_module ml_backend.mlds_to_ilasm. % MLDS -> IL assembler
+:- import_module ml_backend.maybe_mlds_to_gcc. % MLDS -> GCC back-end
+:- import_module ml_backend.ml_util. % MLDS utility predicates
% miscellaneous compiler modules
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_dump.
-:- import_module aditi_backend__rl_file.
-:- import_module check_hlds__goal_path.
-:- import_module hlds__arg_info.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_dump.
+:- import_module aditi_backend.rl_file.
+:- import_module check_hlds.goal_path.
+:- import_module hlds.arg_info.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds.
:- import_module make.
-:- import_module make__options_file.
-:- import_module make__util.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module make.options_file.
+:- import_module make.util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module recompilation.
-:- import_module recompilation__check.
-:- import_module recompilation__usage.
-:- import_module transform_hlds__dependency_graph.
+:- import_module recompilation.check.
+:- import_module recompilation.usage.
+:- import_module transform_hlds.dependency_graph.
% inter-module analysis framework
:- import_module analysis.
-:- import_module transform_hlds__mmc_analysis.
+:- import_module transform_hlds.mmc_analysis.
% compiler library modules
-:- import_module backend_libs__base_typeclass_info.
-:- import_module backend_libs__compile_target_code.
-:- import_module backend_libs__export.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module backend_libs__type_class_info.
-:- import_module backend_libs__type_ctor_info.
-:- import_module libs__globals.
-:- import_module libs__handle_options.
-:- import_module libs__options.
-:- import_module libs__timestamp.
-:- import_module libs__trace_params.
+:- import_module backend_libs.base_typeclass_info.
+:- import_module backend_libs.compile_target_code.
+:- import_module backend_libs.export.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module backend_libs.type_class_info.
+:- import_module backend_libs.type_ctor_info.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.handle_options.
+:- import_module libs.options.
+:- import_module libs.timestamp.
+:- import_module libs.trace_params.
% library modules
:- import_module assoc_list.
Index: compiler/mercury_to_mercury.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mercury_to_mercury.m,v
retrieving revision 1.271
diff -u -b -r1.271 mercury_to_mercury.m
--- compiler/mercury_to_mercury.m 24 Oct 2005 04:14:12 -0000 1.271
+++ compiler/mercury_to_mercury.m 27 Oct 2005 14:31:19 -0000
@@ -44,9 +44,9 @@
:- module parse_tree__mercury_to_mercury.
:- interface.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module char.
@@ -373,14 +373,14 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__rat.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module recompilation__version.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.rat.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module recompilation.version.
:- import_module assoc_list.
:- import_module int.
Index: compiler/middle_rec.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/middle_rec.m,v
retrieving revision 1.109
diff -u -b -r1.109 middle_rec.m
--- compiler/middle_rec.m 24 Oct 2005 04:14:13 -0000 1.109
+++ compiler/middle_rec.m 27 Oct 2005 14:31:19 -0000
@@ -15,9 +15,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
:- pred middle_rec__match_and_generate(hlds_goal::in, code_tree::out,
code_info::in, code_info::out) is semidet.
@@ -27,21 +27,21 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__opt_util.
-:- import_module ll_backend__unify_gen.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module libs.compiler_util.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.opt_util.
+:- import_module ll_backend.unify_gen.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/ml_call_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_call_gen.m,v
retrieving revision 1.58
diff -u -b -r1.58 ml_call_gen.m
--- compiler/ml_call_gen.m 24 Oct 2005 04:14:13 -0000 1.58
+++ compiler/ml_call_gen.m 27 Oct 2005 14:31:19 -0000
@@ -18,12 +18,12 @@
:- module ml_backend__ml_call_gen.
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -117,17 +117,17 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_closure_gen.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_closure_gen.
+:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module int.
Index: compiler/ml_closure_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_closure_gen.m,v
retrieving revision 1.37
diff -u -b -r1.37 ml_closure_gen.m
--- compiler/ml_closure_gen.m 24 Oct 2005 04:14:13 -0000 1.37
+++ compiler/ml_closure_gen.m 27 Oct 2005 14:31:19 -0000
@@ -17,11 +17,11 @@
:- module ml_backend__ml_closure_gen.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -80,30 +80,30 @@
:- implementation.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_module.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_module.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_type.
% XXX The following modules depend on the LLDS,
% so ideally they should not be used here.
:- import_module ll_backend.
-:- import_module ll_backend__continuation_info. % needed for
+:- import_module ll_backend.continuation_info. % needed for
% `generate_closure_layout'
-:- import_module ll_backend__llds. % needed for `layout_locn'
-:- import_module ll_backend__stack_layout. % needed for
+:- import_module ll_backend.llds. % needed for `layout_locn'
+:- import_module ll_backend.stack_layout. % needed for
% `represent_locn_as_int'
-:- import_module ml_backend__ml_call_gen.
-:- import_module ml_backend__ml_unify_gen.
-:- import_module ml_backend__rtti_to_mlds.
+:- import_module ml_backend.ml_call_gen.
+:- import_module ml_backend.ml_unify_gen.
+:- import_module ml_backend.rtti_to_mlds.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/ml_code_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_code_gen.m,v
retrieving revision 1.162
diff -u -b -r1.162 ml_code_gen.m
--- compiler/ml_code_gen.m 24 Oct 2005 04:14:13 -0000 1.162
+++ compiler/ml_code_gen.m 27 Oct 2005 14:31:19 -0000
@@ -709,12 +709,12 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module map.
@@ -765,29 +765,29 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__export.
-:- import_module backend_libs__foreign. % XXX needed for pragma foreign code
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_call_gen.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_switch_gen.
-:- import_module ml_backend__ml_type_gen.
-:- import_module ml_backend__ml_unify_gen.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.export.
+:- import_module backend_libs.foreign. % XXX needed for pragma foreign code
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_call_gen.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_switch_gen.
+:- import_module ml_backend.ml_type_gen.
+:- import_module ml_backend.ml_unify_gen.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/ml_code_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_code_util.m,v
retrieving revision 1.99
diff -u -b -r1.99 ml_code_util.m
--- compiler/ml_code_util.m 24 Oct 2005 04:14:13 -0000 1.99
+++ compiler/ml_code_util.m 27 Oct 2005 14:31:19 -0000
@@ -17,14 +17,14 @@
:- module ml_backend__ml_code_util.
:- interface.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module int.
@@ -729,23 +729,23 @@
:- implementation.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ml_backend__ml_call_gen.
-:- import_module ml_backend__ml_code_gen.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ml_backend.ml_call_gen.
+:- import_module ml_backend.ml_code_gen.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module counter.
:- import_module require.
Index: compiler/ml_elim_nested.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_elim_nested.m,v
retrieving revision 1.74
diff -u -b -r1.74 ml_elim_nested.m
--- compiler/ml_elim_nested.m 24 Oct 2005 04:14:13 -0000 1.74
+++ compiler/ml_elim_nested.m 27 Oct 2005 14:31:19 -0000
@@ -419,7 +419,7 @@
:- interface.
-:- import_module ml_backend__mlds.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -440,19 +440,19 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.prog_util.
% The following imports are needed for mangling pred names.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
:- import_module bool.
:- import_module counter.
Index: compiler/ml_optimize.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_optimize.m,v
retrieving revision 1.34
diff -u -b -r1.34 ml_optimize.m
--- compiler/ml_optimize.m 24 Oct 2005 04:14:14 -0000 1.34
+++ compiler/ml_optimize.m 27 Oct 2005 14:31:19 -0000
@@ -34,7 +34,7 @@
:- module ml_backend__ml_optimize.
:- interface.
-:- import_module ml_backend__mlds.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -44,15 +44,15 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/ml_simplify_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_simplify_switch.m,v
retrieving revision 1.12
diff -u -b -r1.12 ml_simplify_switch.m
--- compiler/ml_simplify_switch.m 24 Oct 2005 04:14:14 -0000 1.12
+++ compiler/ml_simplify_switch.m 27 Oct 2005 14:31:19 -0000
@@ -25,8 +25,8 @@
:- module ml_backend__ml_simplify_switch.
:- interface.
-:- import_module ml_backend__mlds.
-:- import_module ml_backend__ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module ml_backend.ml_code_util.
:- pred ml_simplify_switch(mlds__stmt::in, mlds__context::in,
statement::out, ml_gen_info::in, ml_gen_info::out) is det.
@@ -35,11 +35,11 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ml_backend__ml_switch_gen.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.type_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ml_backend.ml_switch_gen.
:- import_module bool.
:- import_module int.
Index: compiler/ml_string_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_string_switch.m,v
retrieving revision 1.20
diff -u -b -r1.20 ml_string_switch.m
--- compiler/ml_string_switch.m 24 Oct 2005 04:14:14 -0000 1.20
+++ compiler/ml_string_switch.m 27 Oct 2005 14:31:19 -0000
@@ -21,12 +21,12 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- pred generate(cases_list::in, prog_var::in, code_model::in, can_fail::in,
prog_context::in, mlds__defns::out, statements::out,
@@ -36,14 +36,14 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ml_backend__ml_code_gen.
-:- import_module ml_backend__ml_simplify_switch.
-:- import_module ml_backend__ml_switch_gen.
-:- import_module parse_tree__error_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.type_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ml_backend.ml_code_gen.
+:- import_module ml_backend.ml_simplify_switch.
+:- import_module ml_backend.ml_switch_gen.
+:- import_module parse_tree.error_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/ml_switch_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_switch_gen.m,v
retrieving revision 1.19
diff -u -b -r1.19 ml_switch_gen.m
--- compiler/ml_switch_gen.m 24 Oct 2005 04:14:14 -0000 1.19
+++ compiler/ml_switch_gen.m 27 Oct 2005 14:31:19 -0000
@@ -66,13 +66,13 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module libs__globals.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module libs.globals.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -100,21 +100,21 @@
:- implementation.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__switch_util.
-:- import_module check_hlds__type_util.
-:- import_module libs__options.
-:- import_module ml_backend__ml_code_gen.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_simplify_switch.
-:- import_module ml_backend__ml_string_switch.
-:- import_module ml_backend__ml_tag_switch.
-:- import_module ml_backend__ml_unify_gen.
-:- import_module parse_tree__error_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.switch_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module ml_backend.ml_code_gen.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_simplify_switch.
+:- import_module ml_backend.ml_string_switch.
+:- import_module ml_backend.ml_tag_switch.
+:- import_module ml_backend.ml_unify_gen.
:- import_module bool.
:- import_module int.
-:- import_module libs__tree.
+:- import_module libs.tree.
:- import_module map.
:- import_module require.
:- import_module std_util.
Index: compiler/ml_tag_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_tag_switch.m,v
retrieving revision 1.13
diff -u -b -r1.13 ml_tag_switch.m
--- compiler/ml_tag_switch.m 24 Oct 2005 04:14:14 -0000 1.13
+++ compiler/ml_tag_switch.m 27 Oct 2005 14:31:19 -0000
@@ -17,12 +17,12 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -34,15 +34,15 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__ml_code_gen.
-:- import_module ml_backend__ml_simplify_switch.
-:- import_module ml_backend__ml_switch_gen.
-:- import_module ml_backend__ml_unify_gen.
-:- import_module parse_tree__error_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module libs.compiler_util.
+:- import_module ml_backend.ml_code_gen.
+:- import_module ml_backend.ml_simplify_switch.
+:- import_module ml_backend.ml_switch_gen.
+:- import_module ml_backend.ml_unify_gen.
:- import_module assoc_list.
:- import_module int.
Index: compiler/ml_tailcall.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_tailcall.m,v
retrieving revision 1.30
diff -u -b -r1.30 ml_tailcall.m
--- compiler/ml_tailcall.m 24 Oct 2005 04:14:14 -0000 1.30
+++ compiler/ml_tailcall.m 27 Oct 2005 14:31:19 -0000
@@ -57,7 +57,7 @@
:- interface.
-:- import_module ml_backend__mlds.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -76,13 +76,13 @@
:- implementation.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
:- import_module int.
:- import_module list.
Index: compiler/ml_type_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_type_gen.m,v
retrieving revision 1.47
diff -u -b -r1.47 ml_type_gen.m
--- compiler/ml_type_gen.m 24 Oct 2005 04:14:14 -0000 1.47
+++ compiler/ml_type_gen.m 27 Oct 2005 14:31:19 -0000
@@ -26,10 +26,10 @@
:- module ml_backend__ml_type_gen.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module io.
@@ -78,18 +78,18 @@
:- implementation.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/ml_unify_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_unify_gen.m,v
retrieving revision 1.91
diff -u -b -r1.91 ml_unify_gen.m
--- compiler/ml_unify_gen.m 24 Oct 2005 04:14:15 -0000 1.91
+++ compiler/ml_unify_gen.m 27 Oct 2005 14:31:19 -0000
@@ -17,13 +17,13 @@
:- module ml_backend__ml_unify_gen.
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -89,25 +89,25 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__rtti.
-:- import_module backend_libs__type_class_info.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_code_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_call_gen.
-:- import_module ml_backend__ml_closure_gen.
-:- import_module ml_backend__ml_code_gen.
-:- import_module ml_backend__ml_type_gen.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.rtti.
+:- import_module backend_libs.type_class_info.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_code_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_call_gen.
+:- import_module ml_backend.ml_closure_gen.
+:- import_module ml_backend.ml_code_gen.
+:- import_module ml_backend.ml_type_gen.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/ml_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/ml_util.m,v
retrieving revision 1.39
diff -u -b -r1.39 ml_util.m
--- compiler/ml_util.m 24 Oct 2005 04:14:15 -0000 1.39
+++ compiler/ml_util.m 27 Oct 2005 14:31:19 -0000
@@ -16,9 +16,9 @@
:- module ml_backend__ml_util.
:- interface.
-:- import_module libs__globals. % for foreign_language
-:- import_module ml_backend__mlds.
-:- import_module parse_tree__prog_data.
+:- import_module libs.globals. % for foreign_language
+:- import_module ml_backend.mlds.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module std_util.
@@ -164,12 +164,12 @@
:- implementation.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module list.
Index: compiler/mlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds.m,v
retrieving revision 1.126
diff -u -b -r1.126 mlds.m
--- compiler/mlds.m 24 Oct 2005 04:14:15 -0000 1.126
+++ compiler/mlds.m 27 Oct 2005 14:31:19 -0000
@@ -330,17 +330,17 @@
:- interface.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
:- import_module bool.
:- import_module list.
@@ -1679,12 +1679,12 @@
:- implementation.
-:- import_module backend_libs__foreign.
-:- import_module hlds__hlds_data.
-:- import_module libs__globals.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.foreign.
+:- import_module hlds.hlds_data.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_type.
:- import_module char.
:- import_module int.
Index: compiler/mlds_to_c.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_c.m,v
retrieving revision 1.177
diff -u -b -r1.177 mlds_to_c.m
--- compiler/mlds_to_c.m 24 Oct 2005 04:14:15 -0000 1.177
+++ compiler/mlds_to_c.m 27 Oct 2005 14:31:19 -0000
@@ -26,8 +26,8 @@
:- interface.
:- import_module aditi_backend.
-:- import_module aditi_backend__rl_file.
-:- import_module ml_backend__mlds.
+:- import_module aditi_backend.rl_file.
+:- import_module ml_backend.mlds.
:- import_module io.
:- import_module std_util.
@@ -71,31 +71,31 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__rtti. % for rtti__addr_to_string.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_pred. % for pred_proc_id.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_code_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.rtti. % for rtti.addr_to_string.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_pred. % for pred_proc_id.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_code_util.
% for ml_gen_public_field_decl_flags,
% which is used by the code that
% handles derived classes
-:- import_module ml_backend__ml_type_gen. % for ml_gen_type_name
-:- import_module ml_backend__ml_util.
-:- import_module ml_backend__rtti_to_mlds.% for mlds_rtti_type_name.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- import_module ml_backend.ml_type_gen. % for ml_gen_type_name
+:- import_module ml_backend.ml_util.
+:- import_module ml_backend.rtti_to_mlds.% for mlds_rtti_type_name.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/mlds_to_gcc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_gcc.m,v
retrieving revision 1.109
diff -u -b -r1.109 mlds_to_gcc.m
--- compiler/mlds_to_gcc.m 24 Oct 2005 04:14:15 -0000 1.109
+++ compiler/mlds_to_gcc.m 27 Oct 2005 14:31:19 -0000
@@ -93,9 +93,9 @@
:- import_module ml_backend.
:- import_module aditi_backend.
-:- import_module aditi_backend__rl_file.
-:- import_module ml_backend__maybe_mlds_to_gcc.
-:- import_module ml_backend__mlds.
+:- import_module aditi_backend.rl_file.
+:- import_module ml_backend.maybe_mlds_to_gcc.
+:- import_module ml_backend.mlds.
:- import_module bool.
:- import_module std_util.
@@ -159,28 +159,28 @@
% XXX some of these imports might be unused
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__rtti. % for rtti__addr_to_string.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_pred. % for proc_id_to_int and invalid_pred_id
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_code_util.% for ml_gen_public_field_decl_flags,
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.rtti. % for rtti.addr_to_string.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_pred. % for proc_id_to_int and invalid_pred_id
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_code_util.% for ml_gen_public_field_decl_flags,
% which is used by the code that handles
% derived classes
-:- import_module ml_backend__ml_util.
-:- import_module ml_backend__mlds_to_c. % to handle C foreign_code
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module ml_backend.ml_util.
+:- import_module ml_backend.mlds_to_c. % to handle C foreign_code
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/mlds_to_il.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_il.m,v
retrieving revision 1.153
diff -u -b -r1.153 mlds_to_il.m
--- compiler/mlds_to_il.m 24 Oct 2005 04:14:16 -0000 1.153
+++ compiler/mlds_to_il.m 27 Oct 2005 14:31:19 -0000
@@ -60,11 +60,11 @@
:- module ml_backend__mlds_to_il.
:- interface.
-:- import_module hlds__hlds_pred. % for `pred_proc_id'.
-:- import_module libs__globals. % for `foreign_language'.
-:- import_module ml_backend__ilasm.
-:- import_module ml_backend__ilds.
-:- import_module ml_backend__mlds.
+:- import_module hlds.hlds_pred. % for `pred_proc_id'.
+:- import_module libs.globals. % for `foreign_language'.
+:- import_module ml_backend.ilasm.
+:- import_module ml_backend.ilds.
+:- import_module ml_backend.mlds.
:- import_module bool.
:- import_module io.
@@ -143,29 +143,30 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__il_peephole.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_type_gen.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.il_peephole.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_type_gen.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.modules.
+:- 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/mlds_to_ilasm.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_ilasm.m,v
retrieving revision 1.28
diff -u -b -r1.28 mlds_to_ilasm.m
--- compiler/mlds_to_ilasm.m 29 Sep 2005 06:33:10 -0000 1.28
+++ compiler/mlds_to_ilasm.m 27 Oct 2005 14:31:19 -0000
@@ -15,7 +15,7 @@
:- module ml_backend__mlds_to_ilasm.
:- interface.
-:- import_module ml_backend__mlds.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -28,28 +28,28 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred. % for `pred_proc_id'.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ml_backend__ilasm.
-:- import_module ml_backend__ilds.
-:- import_module ml_backend__il_peephole.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds_to_il.
-:- import_module ml_backend__mlds_to_managed.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred. % for `pred_proc_id'.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ml_backend.ilasm.
+:- import_module ml_backend.ilds.
+:- import_module ml_backend.il_peephole.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds_to_il.
+:- import_module ml_backend.mlds_to_managed.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/mlds_to_java.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_java.m,v
retrieving revision 1.71
diff -u -b -r1.71 mlds_to_java.m
--- compiler/mlds_to_java.m 24 Oct 2005 04:14:16 -0000 1.71
+++ compiler/mlds_to_java.m 27 Oct 2005 14:31:19 -0000
@@ -83,8 +83,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__mlds.
+:- import_module hlds.hlds_module.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -99,31 +99,31 @@
% XXX needed for c_util__output_quoted_string,
% c_util__output_quoted_multi_string, and
% c_util__make_float_literal.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__export. % for export__type_to_type_string
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred. % for pred_proc_id.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__java_util.
-:- import_module ml_backend__ml_code_util. % for ml_gen_local_var_decl_flags.
-:- import_module ml_backend__ml_type_gen. % for ml_gen_type_name
-:- import_module ml_backend__ml_util.
-:- import_module ml_backend__rtti_to_mlds. % for mlds_rtti_type_name.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules. % for mercury_std_library_name.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.export. % for export.type_to_type_string
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred. % for pred_proc_id.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.java_util.
+:- import_module ml_backend.ml_code_util. % for ml_gen_local_var_decl_flags.
+:- import_module ml_backend.ml_type_gen. % for ml_gen_type_name
+:- import_module ml_backend.ml_util.
+:- import_module ml_backend.rtti_to_mlds. % for mlds_rtti_type_name.
+:- import_module parse_tree.modules. % for mercury_std_library_name.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io.
+:- 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/mlds_to_managed.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mlds_to_managed.m,v
retrieving revision 1.22
diff -u -b -r1.22 mlds_to_managed.m
--- compiler/mlds_to_managed.m 24 Oct 2005 04:14:16 -0000 1.22
+++ compiler/mlds_to_managed.m 27 Oct 2005 14:31:19 -0000
@@ -15,8 +15,8 @@
:- module ml_backend__mlds_to_managed.
:- interface.
-:- import_module libs__globals.
-:- import_module ml_backend__mlds.
+:- import_module libs.globals.
+:- import_module ml_backend.mlds.
:- import_module io.
@@ -41,28 +41,28 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_pred. % for `pred_proc_id'.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ilasm.
-:- import_module ml_backend__ilds.
-:- import_module ml_backend__il_peephole.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__mlds_to_il.
-:- import_module ml_backend__ml_util.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_pred. % for `pred_proc_id'.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ilasm.
+:- import_module ml_backend.ilds.
+:- import_module ml_backend.il_peephole.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.mlds_to_il.
+:- import_module ml_backend.ml_util.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/mmc_analysis.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mmc_analysis.m,v
retrieving revision 1.8
diff -u -b -r1.8 mmc_analysis.m
--- compiler/mmc_analysis.m 12 Oct 2005 23:51:37 -0000 1.8
+++ compiler/mmc_analysis.m 27 Oct 2005 14:31:19 -0000
@@ -17,9 +17,9 @@
:- interface.
:- import_module analysis.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- type mmc ---> mmc.
@@ -33,10 +33,10 @@
:- implementation.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__unused_args.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.unused_args.
:- import_module bool.
:- import_module std_util.
Index: compiler/mode_constraint_robdd.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_constraint_robdd.m,v
retrieving revision 1.6
diff -u -b -r1.6 mode_constraint_robdd.m
--- compiler/mode_constraint_robdd.m 24 Oct 2005 04:14:17 -0000 1.6
+++ compiler/mode_constraint_robdd.m 27 Oct 2005 14:31:19 -0000
@@ -19,9 +19,9 @@
:- module check_hlds__mode_constraint_robdd.
:- interface.
-:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
:- import_module mode_robdd.
:- import_module bool.
@@ -141,7 +141,7 @@
:- implementation.
% :- import_module mode_robdd__tfeir.
-:- import_module mode_robdd__tfeirn.
+:- import_module mode_robdd.tfeirn.
% :- import_module mode_robdd__check.
:- import_module assoc_list.
Index: compiler/mode_constraints.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_constraints.m,v
retrieving revision 1.16
diff -u -b -r1.16 mode_constraints.m
--- compiler/mode_constraints.m 24 Oct 2005 04:14:17 -0000 1.16
+++ compiler/mode_constraints.m 27 Oct 2005 14:31:19 -0000
@@ -17,7 +17,7 @@
:- module check_hlds__mode_constraints.
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
:- pred process_module(module_info::in, module_info::out,
@@ -29,29 +29,29 @@
:- import_module check_hlds.abstract_mode_constraints.
:- import_module check_hlds.build_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_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__inst_graph.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
+:- 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_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.inst_graph.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree.prog_io.
+:- import_module mode_robdd.tfeirn.
:- import_module parse_tree.modules.
-:- import_module transform_hlds__dependency_graph.
+:- 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.
Index: compiler/mode_debug.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_debug.m,v
retrieving revision 1.23
diff -u -b -r1.23 mode_debug.m
--- compiler/mode_debug.m 24 Oct 2005 04:14:17 -0000 1.23
+++ compiler/mode_debug.m 27 Oct 2005 14:31:19 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module check_hlds__mode_info.
+:- import_module check_hlds.mode_info.
:- import_module io.
% Print a debugging message which includes the port, message string,
@@ -37,16 +37,16 @@
:- implementation.
-:- import_module check_hlds__modes.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
+:- import_module check_hlds.modes.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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.
Index: compiler/mode_errors.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_errors.m,v
retrieving revision 1.93
diff -u -b -r1.93 mode_errors.m
--- compiler/mode_errors.m 24 Oct 2005 04:14:17 -0000 1.93
+++ compiler/mode_errors.m 27 Oct 2005 14:31:19 -0000
@@ -18,12 +18,12 @@
:- interface.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_goal.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module check_hlds__mode_info.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_goal.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module check_hlds.mode_info.
:- import_module bool.
:- import_module io.
@@ -224,18 +224,19 @@
:- 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__globals.
-:- import_module libs__options.
-:- 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_util.
+:- 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.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/mode_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_info.m,v
retrieving revision 1.76
diff -u -b -r1.76 mode_info.m
--- compiler/mode_info.m 24 Oct 2005 04:14:17 -0000 1.76
+++ compiler/mode_info.m 27 Oct 2005 14:31:19 -0000
@@ -18,15 +18,15 @@
:- interface.
-:- import_module check_hlds__delay_info.
-:- import_module check_hlds__mode_errors.
-:- 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 mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.delay_info.
+:- import_module check_hlds.mode_errors.
+:- 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 mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bag.
@@ -265,12 +265,12 @@
:- implementation.
-:- import_module check_hlds__delay_info.
-:- import_module check_hlds__mode_errors.
-:- import_module check_hlds__mode_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
+:- import_module check_hlds.delay_info.
+:- import_module check_hlds.mode_errors.
+:- import_module check_hlds.mode_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module int.
:- import_module queue.
Index: compiler/mode_ordering.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_ordering.m,v
retrieving revision 1.6
diff -u -b -r1.6 mode_ordering.m
--- compiler/mode_ordering.m 27 Aug 2005 09:41:57 -0000 1.6
+++ compiler/mode_ordering.m 27 Oct 2005 14:31:19 -0000
@@ -13,10 +13,10 @@
:- interface.
-:- import_module check_hlds__mode_constraint_robdd.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__inst_graph.
+:- import_module check_hlds.mode_constraint_robdd.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.inst_graph.
:- import_module io.
:- import_module list.
@@ -43,14 +43,14 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module check_hlds__mode_constraint_robdd.
-:- import_module hlds__hlds_goal.
+:- import_module check_hlds.clause_to_proc.
+:- import_module check_hlds.mode_constraint_robdd.
+:- 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 parse_tree__prog_data.
+:- import_module mode_robdd.tfeirn.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module relation.
Index: compiler/mode_robdd.check.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.check.m,v
retrieving revision 1.5
diff -u -b -r1.5 mode_robdd.check.m
--- compiler/mode_robdd.check.m 24 Oct 2005 04:14:17 -0000 1.5
+++ compiler/mode_robdd.check.m 27 Oct 2005 14:31:19 -0000
@@ -21,7 +21,7 @@
:- interface.
-:- import_module mode_robdd__tfeirn.
+:- import_module mode_robdd.tfeirn.
:- import_module robdd.
:- import_module term.
@@ -161,10 +161,10 @@
:- implementation.
-:- import_module mode_robdd__r.
-:- import_module mode_robdd__tfer.
-:- import_module mode_robdd__tfeir.
-:- import_module mode_robdd__tfeirn.
+:- import_module mode_robdd.r.
+:- import_module mode_robdd.tfer.
+:- import_module mode_robdd.tfeir.
+:- import_module mode_robdd.tfeirn.
:- import_module require.
:- import_module robdd.
Index: compiler/mode_robdd.equiv_vars.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.equiv_vars.m,v
retrieving revision 1.2
diff -u -b -r1.2 mode_robdd.equiv_vars.m
--- compiler/mode_robdd.equiv_vars.m 22 Mar 2005 06:40:13 -0000 1.2
+++ compiler/mode_robdd.equiv_vars.m 27 Oct 2005 14:31:19 -0000
@@ -12,7 +12,7 @@
:- interface.
:- import_module check_hlds.
-:- import_module check_hlds__mode_constraint_robdd.
+:- import_module check_hlds.mode_constraint_robdd.
:- import_module bool.
:- import_module robdd.
Index: compiler/mode_robdd.implications.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.implications.m,v
retrieving revision 1.3
diff -u -b -r1.3 mode_robdd.implications.m
--- compiler/mode_robdd.implications.m 24 Oct 2005 04:14:17 -0000 1.3
+++ compiler/mode_robdd.implications.m 27 Oct 2005 14:31:19 -0000
@@ -61,7 +61,7 @@
:- implementation.
-:- import_module mode_robdd__equiv_vars.
+:- import_module mode_robdd.equiv_vars.
:- import_module assoc_list.
:- import_module list.
Index: compiler/mode_robdd.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.m,v
retrieving revision 1.1
diff -u -b -r1.1 mode_robdd.m
--- compiler/mode_robdd.m 20 Dec 2004 01:15:41 -0000 1.1
+++ compiler/mode_robdd.m 27 Oct 2005 14:31:19 -0000
@@ -29,7 +29,7 @@
% The default implementation of mode_robdd's stores as much information
% out of the robdd itself as possible, for performance.
-:- import_module mode_robdd__tfeirn.
+:- import_module mode_robdd.tfeirn.
:- type mode_robdd(T) == tfeirn(T).
% You may wish to use this type instead, for comparing to mode_robdd
Index: compiler/mode_robdd.tfeir.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.tfeir.m,v
retrieving revision 1.3
diff -u -b -r1.3 mode_robdd.tfeir.m
--- compiler/mode_robdd.tfeir.m 24 Oct 2005 04:14:17 -0000 1.3
+++ compiler/mode_robdd.tfeir.m 27 Oct 2005 14:31:19 -0000
@@ -15,7 +15,7 @@
:- interface.
:- import_module check_hlds.
-:- import_module check_hlds__mode_constraint_robdd.
+:- import_module check_hlds.mode_constraint_robdd.
:- import_module robdd.
:- import_module term.
@@ -164,8 +164,8 @@
:- implementation.
-:- import_module mode_robdd__equiv_vars.
-:- import_module mode_robdd__implications.
+:- import_module mode_robdd.equiv_vars.
+:- import_module mode_robdd.implications.
:- import_module bool.
:- import_module int.
Index: compiler/mode_robdd.tfeirn.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.tfeirn.m,v
retrieving revision 1.3
diff -u -b -r1.3 mode_robdd.tfeirn.m
--- compiler/mode_robdd.tfeirn.m 24 Oct 2005 04:14:17 -0000 1.3
+++ compiler/mode_robdd.tfeirn.m 27 Oct 2005 14:31:19 -0000
@@ -15,7 +15,7 @@
:- interface.
:- import_module check_hlds.
-:- import_module check_hlds__mode_constraint_robdd.
+:- import_module check_hlds.mode_constraint_robdd.
:- import_module robdd.
:- import_module term.
@@ -189,8 +189,8 @@
:- implementation.
-:- import_module mode_robdd__equiv_vars.
-:- import_module mode_robdd__implications.
+:- import_module mode_robdd.equiv_vars.
+:- import_module mode_robdd.implications.
:- import_module bool.
:- import_module int.
Index: compiler/mode_robdd.tfer.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_robdd.tfer.m,v
retrieving revision 1.2
diff -u -b -r1.2 mode_robdd.tfer.m
--- compiler/mode_robdd.tfer.m 22 Mar 2005 06:40:13 -0000 1.2
+++ compiler/mode_robdd.tfer.m 27 Oct 2005 14:31:19 -0000
@@ -137,7 +137,7 @@
:- implementation.
-:- import_module mode_robdd__equiv_vars.
+:- import_module mode_robdd.equiv_vars.
:- import_module bool.
:- import_module int.
Index: compiler/mode_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mode_util.m,v
retrieving revision 1.176
diff -u -b -r1.176 mode_util.m
--- compiler/mode_util.m 24 Oct 2005 04:14:17 -0000 1.176
+++ compiler/mode_util.m 27 Oct 2005 14:31:19 -0000
@@ -17,11 +17,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -187,17 +187,17 @@
:- 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 mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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.compiler_util.
+:- 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_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/modecheck_call.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modecheck_call.m,v
retrieving revision 1.61
diff -u -b -r1.61 modecheck_call.m
--- compiler/modecheck_call.m 24 Oct 2005 04:14:18 -0000 1.61
+++ compiler/modecheck_call.m 27 Oct 2005 14:31:19 -0000
@@ -23,13 +23,13 @@
:- module check_hlds__modecheck_call.
:- interface.
-:- import_module check_hlds__mode_info.
-:- import_module check_hlds__modes.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_info.
+:- import_module check_hlds.modes.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module std_util.
@@ -74,22 +74,22 @@
:- 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 parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
+:- 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 parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module int.
Index: compiler/modecheck_unify.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modecheck_unify.m,v
retrieving revision 1.91
diff -u -b -r1.91 modecheck_unify.m
--- compiler/modecheck_unify.m 24 Oct 2005 04:14:18 -0000 1.91
+++ compiler/modecheck_unify.m 27 Oct 2005 14:31:19 -0000
@@ -22,9 +22,9 @@
:- module check_hlds__modecheck_unify.
:- interface.
-:- import_module check_hlds__mode_info.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_info.
+:- import_module hlds.hlds_goal.
+:- import_module parse_tree.prog_data.
:- import_module io.
@@ -45,34 +45,34 @@
:- implementation.
-:- 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__modecheck_call.
-:- import_module check_hlds__modes.
-:- import_module check_hlds__polymorphism.
-:- 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_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 mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.module_qual.
+:- 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.
Index: compiler/modes.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modes.m,v
retrieving revision 1.319
diff -u -b -r1.319 modes.m
--- compiler/modes.m 26 Oct 2005 03:04:24 -0000 1.319
+++ compiler/modes.m 27 Oct 2005 14:31:19 -0000
@@ -130,11 +130,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -191,7 +191,7 @@
% The following predicates are used by unique_modes.m.
-:- import_module check_hlds__mode_info.
+:- import_module check_hlds.mode_info.
% Modecheck a unification.
@@ -340,38 +340,38 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module check_hlds__delay_info.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__inst_util.
-:- import_module check_hlds__modecheck_call.
-:- import_module check_hlds__modecheck_unify.
-:- 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__polymorphism.
-:- import_module check_hlds__purity.
-:- 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_out.
-:- import_module hlds__instmap.
-:- import_module hlds__make_hlds.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module hlds__special_pred.
-:- 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__module_qual.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.clause_to_proc.
+:- import_module check_hlds.delay_info.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.inst_util.
+:- import_module check_hlds.modecheck_call.
+:- import_module check_hlds.modecheck_unify.
+:- 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.polymorphism.
+:- import_module check_hlds.purity.
+:- 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_out.
+:- import_module hlds.instmap.
+:- import_module hlds.make_hlds.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module hlds.special_pred.
+:- 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.module_qual.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bag.
Index: compiler/module_qual.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/module_qual.m,v
retrieving revision 1.117
diff -u -b -r1.117 module_qual.m
--- compiler/module_qual.m 24 Oct 2005 04:14:19 -0000 1.117
+++ compiler/module_qual.m 27 Oct 2005 14:31:19 -0000
@@ -123,6 +123,7 @@
:- implementation.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.options.
:- import_module parse_tree.error_util.
@@ -130,8 +131,8 @@
:- import_module parse_tree.modules.
:- import_module parse_tree.prog_io.
:- import_module parse_tree.prog_out.
-:- import_module parse_tree.prog_util.
:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module int.
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.353
diff -u -b -r1.353 modules.m
--- compiler/modules.m 27 Oct 2005 02:21:57 -0000 1.353
+++ compiler/modules.m 27 Oct 2005 14:31:19 -0000
@@ -42,11 +42,11 @@
:- interface.
-:- import_module libs__globals.
-:- import_module libs__timestamp.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io.
+:- import_module libs.globals.
+:- import_module libs.timestamp.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io.
:- import_module bool.
:- import_module io.
@@ -785,22 +785,23 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module libs__handle_options.
-:- import_module libs__options.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.handle_options.
+:- import_module libs.options.
:- import_module make. % XXX undesirable dependency
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_mutable.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__source_file_map.
-:- import_module recompilation__version.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_mutable.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.source_file_map.
+:- import_module recompilation.version.
:- import_module assoc_list.
:- import_module char.
Index: compiler/name_mangle.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/name_mangle.m,v
retrieving revision 1.13
diff -u -b -r1.13 name_mangle.m
--- compiler/name_mangle.m 12 Oct 2005 23:51:37 -0000 1.13
+++ compiler/name_mangle.m 27 Oct 2005 14:31:19 -0000
@@ -26,8 +26,8 @@
:- module backend_libs__name_mangle.
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module mdbcomp__prim_data.
+:- import_module backend_libs.rtti.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module io.
@@ -96,11 +96,11 @@
:- implementation.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__special_pred.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_util.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.special_pred.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_util.
:- import_module char.
:- import_module int.
Index: compiler/opt_debug.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/opt_debug.m,v
retrieving revision 1.159
diff -u -b -r1.159 opt_debug.m
--- compiler/opt_debug.m 24 Oct 2005 04:14:20 -0000 1.159
+++ compiler/opt_debug.m 27 Oct 2005 14:31:19 -0000
@@ -16,13 +16,13 @@
:- interface.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__rtti.
-:- import_module hlds__code_model.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__livemap.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.rtti.
+:- import_module hlds.code_model.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.livemap.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module assoc_list.
:- import_module bool.
@@ -117,18 +117,18 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__opt_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.opt_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module char.
:- import_module int.
Index: compiler/opt_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/opt_util.m,v
retrieving revision 1.138
diff -u -b -r1.138 opt_util.m
--- compiler/opt_util.m 24 Oct 2005 04:14:20 -0000 1.138
+++ compiler/opt_util.m 27 Oct 2005 14:31:19 -0000
@@ -16,8 +16,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module list.
@@ -295,14 +295,14 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__proc_label.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__special_pred.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__llds_out.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.proc_label.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.llds_out.
+:- import_module parse_tree.prog_data.
:- import_module int.
:- import_module require.
Index: compiler/optimize.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/optimize.m,v
retrieving revision 1.50
diff -u -b -r1.50 optimize.m
--- compiler/optimize.m 25 Oct 2005 06:33:01 -0000 1.50
+++ compiler/optimize.m 27 Oct 2005 14:31:19 -0000
@@ -16,8 +16,8 @@
:- interface.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
:- import_module io.
:- import_module list.
@@ -32,28 +32,28 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__delay_slot.
-:- import_module ll_backend__dupelim.
-:- import_module ll_backend__frameopt.
-:- import_module ll_backend__jumpopt.
-:- import_module ll_backend__labelopt.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__opt_debug.
-:- import_module ll_backend__opt_util.
-:- import_module ll_backend__peephole.
-:- import_module ll_backend__reassign.
-:- import_module ll_backend__use_local_vars.
-:- import_module ll_backend__wrap_blocks.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.delay_slot.
+:- import_module ll_backend.dupelim.
+:- import_module ll_backend.frameopt.
+:- import_module ll_backend.jumpopt.
+:- import_module ll_backend.labelopt.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.opt_debug.
+:- import_module ll_backend.opt_util.
+:- import_module ll_backend.peephole.
+:- import_module ll_backend.reassign.
+:- import_module ll_backend.use_local_vars.
+:- import_module ll_backend.wrap_blocks.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module bool.
:- import_module char.
Index: compiler/options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.471
diff -u -b -r1.471 options.m
--- compiler/options.m 25 Oct 2005 06:33:02 -0000 1.471
+++ compiler/options.m 27 Oct 2005 14:31:19 -0000
@@ -764,7 +764,7 @@
:- implementation.
-:- import_module libs__handle_options.
+:- import_module libs.handle_options.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/options_file.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/options_file.m,v
retrieving revision 1.30
diff -u -b -r1.30 options_file.m
--- compiler/options_file.m 12 Oct 2005 04:59:40 -0000 1.30
+++ compiler/options_file.m 27 Oct 2005 14:31:19 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module io.
:- import_module list.
@@ -75,11 +75,11 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/par_conj_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/par_conj_gen.m,v
retrieving revision 1.19
diff -u -b -r1.19 par_conj_gen.m
--- compiler/par_conj_gen.m 12 Oct 2005 23:51:37 -0000 1.19
+++ compiler/par_conj_gen.m 27 Oct 2005 14:31:20 -0000
@@ -100,10 +100,10 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
:- import_module list.
@@ -114,19 +114,19 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__continuation_info.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.continuation_info.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module int.
Index: compiler/passes_aux.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/passes_aux.m,v
retrieving revision 1.74
diff -u -b -r1.74 passes_aux.m
--- compiler/passes_aux.m 24 Oct 2005 04:14:20 -0000 1.74
+++ compiler/passes_aux.m 27 Oct 2005 14:31:20 -0000
@@ -15,10 +15,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -202,15 +202,15 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_out.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__process_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_util.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_out.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.process_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_util.
:- import_module int.
:- import_module map.
Index: compiler/pd_cost.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pd_cost.m,v
retrieving revision 1.24
diff -u -b -r1.24 pd_cost.m
--- compiler/pd_cost.m 12 Oct 2005 23:51:37 -0000 1.24
+++ compiler/pd_cost.m 27 Oct 2005 14:31:20 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module hlds__hlds_goal.
+:- import_module hlds.hlds_goal.
:- pred pd_cost__goal(hlds_goal::in, int::out) is det.
@@ -39,8 +39,8 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module parse_tree.prog_data.
:- import_module int.
:- import_module list.
Index: compiler/pd_debug.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pd_debug.m,v
retrieving revision 1.15
diff -u -b -r1.15 pd_debug.m
--- compiler/pd_debug.m 12 Oct 2005 23:51:37 -0000 1.15
+++ compiler/pd_debug.m 27 Oct 2005 14:31:20 -0000
@@ -17,10 +17,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__pd_info.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.pd_info.
:- import_module io.
:- import_module list.
@@ -55,15 +55,15 @@
:- implementation.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_out.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_out.
:- import_module bool.
:- import_module set.
Index: compiler/pd_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pd_info.m,v
retrieving revision 1.22
diff -u -b -r1.22 pd_info.m
--- compiler/pd_info.m 24 Oct 2005 04:14:20 -0000 1.22
+++ compiler/pd_info.m 27 Oct 2005 14:31:20 -0000
@@ -17,12 +17,12 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__pd_term.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.pd_term.
:- import_module bool.
:- import_module counter.
@@ -112,17 +112,17 @@
:- implementation.
-:- import_module check_hlds__det_util.
-:- import_module check_hlds__inst_match.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__pd_debug.
-:- import_module transform_hlds__pd_util.
+:- import_module check_hlds.det_util.
+:- import_module check_hlds.inst_match.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.pd_debug.
+:- import_module transform_hlds.pd_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/pd_term.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pd_term.m,v
retrieving revision 1.11
diff -u -b -r1.11 pd_term.m
--- compiler/pd_term.m 12 Oct 2005 23:51:37 -0000 1.11
+++ compiler/pd_term.m 27 Oct 2005 14:31:20 -0000
@@ -41,11 +41,11 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module transform_hlds__pd_info.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module transform_hlds.pd_info.
:- import_module list.
:- import_module std_util.
@@ -100,10 +100,10 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__pd_util.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.pd_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/pd_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pd_util.m,v
retrieving revision 1.42
diff -u -b -r1.42 pd_util.m
--- compiler/pd_util.m 24 Oct 2005 04:14:20 -0000 1.42
+++ compiler/pd_util.m 27 Oct 2005 14:31:20 -0000
@@ -15,13 +15,13 @@
:- interface.
-:- import_module check_hlds__mode_errors.
-:- import_module check_hlds__simplify.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__pd_info.
+:- import_module check_hlds.mode_errors.
+:- import_module check_hlds.simplify.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.pd_info.
:- import_module bool.
:- import_module io.
@@ -148,28 +148,28 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__det_report.
-:- import_module check_hlds__det_util.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__inst_util.
-:- import_module check_hlds__mode_info.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__unique_modes.
-:- import_module hlds__goal_form.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module transform_hlds__constraint.
-:- import_module transform_hlds__pd_cost.
-:- import_module transform_hlds__pd_debug.
-:- import_module transform_hlds__unused_args.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.det_report.
+:- import_module check_hlds.det_util.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.inst_util.
+:- import_module check_hlds.mode_info.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module check_hlds.type_util.
+:- import_module check_hlds.unique_modes.
+:- import_module hlds.goal_form.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module transform_hlds.constraint.
+:- import_module transform_hlds.pd_cost.
+:- import_module transform_hlds.pd_debug.
+:- import_module transform_hlds.unused_args.
:- import_module assoc_list.
:- import_module int.
@@ -359,9 +359,8 @@
goal_info_get_determinism(GoalInfo0, Det),
det_get_soln_context(Det, SolnContext),
- % det_infer_goal looks up the proc_info in the module_info
- % for the vartypes, so we'd better stick them back in the
- % module_info.
+ % det_infer_goal looks up the proc_info in the module_info for the
+ % vartypes, so we'd better stick them back in the module_info.
pd_info_get_pred_proc_id(!.PDInfo, proc(PredId, ProcId)),
pd_info_get_pred_info(!.PDInfo, PredInfo),
pd_info_get_proc_info(!.PDInfo, ProcInfo),
@@ -374,7 +373,7 @@
proc_info_vartypes(ProcInfo, VarTypes),
det_info_init(ModuleInfo, VarTypes, PredId, ProcId, Globals, DetInfo),
pd_info_get_instmap(!.PDInfo, InstMap),
- det_infer_goal(Goal0, Goal, InstMap, SolnContext, DetInfo, _, Msgs),
+ det_infer_goal(Goal0, Goal, InstMap, SolnContext, [], DetInfo, _, _, Msgs),
% Make sure there were no errors.
disable_det_warnings(OptionsToRestore, !IO),
Index: compiler/peephole.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/peephole.m,v
retrieving revision 1.86
diff -u -b -r1.86 peephole.m
--- compiler/peephole.m 4 Oct 2005 23:33:53 -0000 1.86
+++ compiler/peephole.m 27 Oct 2005 14:31:20 -0000
@@ -16,8 +16,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module libs__globals.
+:- import_module ll_backend.llds.
+:- import_module libs.globals.
:- import_module bool.
:- import_module list.
@@ -31,10 +31,10 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__opt_debug.
-:- import_module ll_backend__opt_util.
+:- import_module backend_libs.builtin_ops.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.opt_debug.
+:- import_module ll_backend.opt_util.
:- import_module int.
:- import_module map.
Index: compiler/polymorphism.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/polymorphism.m,v
retrieving revision 1.282
diff -u -b -r1.282 polymorphism.m
--- compiler/polymorphism.m 25 Oct 2005 13:08:25 -0000 1.282
+++ compiler/polymorphism.m 27 Oct 2005 14:31:20 -0000
@@ -174,11 +174,11 @@
:- module check_hlds__polymorphism.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -368,29 +368,30 @@
:- implementation.
-:- import_module check_hlds__clause_to_proc.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module check_hlds__type_util.
-:- import_module check_hlds__typecheck.
-:- import_module check_hlds__unify_proc.
-:- import_module hlds__goal_util.
-:- 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__quantification.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- 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_code_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module hlds.special_pred.
+:- 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 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_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/post_term_analysis.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/post_term_analysis.m,v
retrieving revision 1.6
diff -u -b -r1.6 post_term_analysis.m
--- compiler/post_term_analysis.m 5 Oct 2005 06:33:50 -0000 1.6
+++ compiler/post_term_analysis.m 27 Oct 2005 14:31:20 -0000
@@ -34,9 +34,7 @@
:- import_module backend_libs.
:- import_module backend_libs.foreign.
-
:- import_module check_hlds.type_util.
-
:- import_module hlds.goal_form.
:- import_module hlds.goal_util.
:- import_module hlds.hlds_data.
@@ -45,12 +43,10 @@
:- import_module hlds.hlds_out.
:- import_module hlds.hlds_pred.
:- import_module hlds.special_pred.
-
-:- import_module mdbcomp.prim_data.
-
+:- 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.prog_data.
Index: compiler/post_typecheck.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/post_typecheck.m,v
retrieving revision 1.86
diff -u -b -r1.86 post_typecheck.m
--- compiler/post_typecheck.m 25 Oct 2005 13:08:26 -0000 1.86
+++ compiler/post_typecheck.m 27 Oct 2005 14:31:20 -0000
@@ -34,11 +34,11 @@
:- module check_hlds__post_typecheck.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -125,26 +125,27 @@
:- implementation.
-:- 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_data.
-:- import_module hlds__hlds_error_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- 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 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_data.
+:- import_module hlds.hlds_error_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- 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.
:- import_module int.
Index: compiler/pragma_c_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pragma_c_gen.m,v
retrieving revision 1.85
diff -u -b -r1.85 pragma_c_gen.m
--- compiler/pragma_c_gen.m 24 Oct 2005 04:14:22 -0000 1.85
+++ compiler/pragma_c_gen.m 27 Oct 2005 14:31:20 -0000
@@ -23,13 +23,13 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -51,25 +51,25 @@
:- implementation.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__name_mangle.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.name_mangle.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/proc_label.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/proc_label.m,v
retrieving revision 1.13
diff -u -b -r1.13 proc_label.m
--- compiler/proc_label.m 5 Oct 2005 06:33:51 -0000 1.13
+++ compiler/proc_label.m 27 Oct 2005 14:31:21 -0000
@@ -20,10 +20,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
@@ -53,12 +53,12 @@
:- implementation.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__special_pred.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module list.
:- import_module require.
Index: compiler/process_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/process_util.m,v
retrieving revision 1.16
diff -u -b -r1.16 process_util.m
--- compiler/process_util.m 12 Oct 2005 23:51:37 -0000 1.16
+++ compiler/process_util.m 27 Oct 2005 14:31:21 -0000
@@ -83,8 +83,8 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module require.
:- import_module std_util.
Index: compiler/prog_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_data.m,v
retrieving revision 1.143
diff -u -b -r1.143 prog_data.m
--- compiler/prog_data.m 24 Oct 2005 04:14:22 -0000 1.143
+++ compiler/prog_data.m 27 Oct 2005 14:31:21 -0000
@@ -20,11 +20,11 @@
:- interface.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__rat.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.rat.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module recompilation.
:- import_module assoc_list.
@@ -1953,7 +1953,7 @@
:- implementation.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module string.
Index: compiler/prog_io.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io.m,v
retrieving revision 1.256
diff -u -b -r1.256 prog_io.m
--- compiler/prog_io.m 24 Oct 2005 04:14:22 -0000 1.256
+++ compiler/prog_io.m 27 Oct 2005 14:31:21 -0000
@@ -57,10 +57,10 @@
:- interface.
-:- import_module libs__timestamp.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module libs.timestamp.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module bool.
:- import_module io.
@@ -269,21 +269,21 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_io_dcg.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_io_pragma.
-:- import_module parse_tree__prog_io_typeclass.
-:- 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 libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_io_dcg.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_io_pragma.
+:- import_module parse_tree.prog_io_typeclass.
+:- 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 recompilation.
-:- import_module recompilation__version.
+:- import_module recompilation.version.
:- import_module assoc_list.
:- import_module dir.
Index: compiler/prog_io_dcg.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io_dcg.m,v
retrieving revision 1.32
diff -u -b -r1.32 prog_io_dcg.m
--- compiler/prog_io_dcg.m 24 Oct 2005 04:14:23 -0000 1.32
+++ compiler/prog_io_dcg.m 27 Oct 2005 14:31:21 -0000
@@ -21,9 +21,9 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module term.
:- import_module varset.
@@ -42,10 +42,10 @@
:- implementation.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_out.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_out.
:- import_module counter.
:- import_module int.
Index: compiler/prog_io_goal.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io_goal.m,v
retrieving revision 1.37
diff -u -b -r1.37 prog_io_goal.m
--- compiler/prog_io_goal.m 24 Oct 2005 04:14:24 -0000 1.37
+++ compiler/prog_io_goal.m 27 Oct 2005 14:31:21 -0000
@@ -15,7 +15,7 @@
:- interface.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module term.
@@ -84,11 +84,11 @@
:- implementation.
-:- import_module mdbcomp__prim_data.
-:- 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 mdbcomp.prim_data.
+:- 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 int.
:- import_module map.
Index: compiler/prog_io_pragma.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io_pragma.m,v
retrieving revision 1.91
diff -u -b -r1.91 prog_io_pragma.m
--- compiler/prog_io_pragma.m 24 Oct 2005 04:14:24 -0000 1.91
+++ compiler/prog_io_pragma.m 27 Oct 2005 14:31:21 -0000
@@ -15,10 +15,10 @@
:- interface.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module list.
:- import_module term.
@@ -40,11 +40,11 @@
:- implementation.
-:- import_module libs__lp_rational.
-:- import_module libs__rat.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_util.
+:- import_module libs.lp_rational.
+:- import_module libs.rat.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/prog_io_typeclass.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io_typeclass.m,v
retrieving revision 1.44
diff -u -b -r1.44 prog_io_typeclass.m
--- compiler/prog_io_typeclass.m 24 Oct 2005 04:14:24 -0000 1.44
+++ compiler/prog_io_typeclass.m 27 Oct 2005 14:31:21 -0000
@@ -16,9 +16,9 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module list.
:- import_module term.
@@ -49,10 +49,10 @@
:- implementation.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module int.
:- import_module map.
Index: compiler/prog_io_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io_util.m,v
retrieving revision 1.41
diff -u -b -r1.41 prog_io_util.m
--- compiler/prog_io_util.m 24 Oct 2005 04:14:24 -0000 1.41
+++ compiler/prog_io_util.m 27 Oct 2005 14:31:21 -0000
@@ -25,8 +25,8 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module map.
@@ -166,13 +166,13 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- 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 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 bool.
:- import_module set.
Index: compiler/prog_mode.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_mode.m,v
retrieving revision 1.9
diff -u -b -r1.9 prog_mode.m
--- compiler/prog_mode.m 24 Oct 2005 04:14:24 -0000 1.9
+++ compiler/prog_mode.m 27 Oct 2005 14:31:21 -0000
@@ -15,7 +15,7 @@
:- interface.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -133,8 +133,8 @@
:- implementation.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_util.
:- import_module map.
:- import_module require.
Index: compiler/prog_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_out.m,v
retrieving revision 1.64
diff -u -b -r1.64 prog_out.m
--- compiler/prog_out.m 24 Oct 2005 04:14:25 -0000 1.64
+++ compiler/prog_out.m 27 Oct 2005 14:31:21 -0000
@@ -21,8 +21,8 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -166,8 +166,8 @@
:- implementation.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_util.
:- import_module int.
:- import_module require.
Index: compiler/prog_rep.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_rep.m,v
retrieving revision 1.38
diff -u -b -r1.38 prog_rep.m
--- compiler/prog_rep.m 19 Oct 2005 05:39:03 -0000 1.38
+++ compiler/prog_rep.m 27 Oct 2005 14:31:21 -0000
@@ -20,12 +20,12 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module ll_backend__stack_layout.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module ll_backend.stack_layout.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module map.
@@ -48,18 +48,18 @@
:- implementation.
-:- import_module backend_libs__bytecode_data.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.bytecode_data.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module mdbcomp.
-:- import_module mdbcomp__program_representation.
+:- import_module mdbcomp.program_representation.
:- import_module int.
:- import_module require.
Index: compiler/prog_type.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_type.m,v
retrieving revision 1.10
diff -u -b -r1.10 prog_type.m
--- compiler/prog_type.m 24 Oct 2005 04:14:25 -0000 1.10
+++ compiler/prog_type.m 27 Oct 2005 14:31:21 -0000
@@ -256,7 +256,7 @@
:- implementation.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module parse_tree.prog_io.
:- import_module parse_tree.prog_out.
:- import_module parse_tree.prog_util.
Index: compiler/prog_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_util.m,v
retrieving revision 1.80
diff -u -b -r1.80 prog_util.m
--- compiler/prog_util.m 24 Oct 2005 04:14:25 -0000 1.80
+++ compiler/prog_util.m 27 Oct 2005 14:31:21 -0000
@@ -15,8 +15,8 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module std_util.
@@ -268,9 +268,9 @@
:- implementation.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
:- import_module bool.
:- import_module int.
Index: compiler/pseudo_type_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/pseudo_type_info.m,v
retrieving revision 1.19
diff -u -b -r1.19 pseudo_type_info.m
--- compiler/pseudo_type_info.m 24 Oct 2005 04:14:25 -0000 1.19
+++ compiler/pseudo_type_info.m 27 Oct 2005 14:31:21 -0000
@@ -19,8 +19,8 @@
:- module backend_libs__pseudo_type_info.
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.rtti.
+:- import_module parse_tree.prog_data.
% construct_pseudo_type_info(Type, NumUnivQTvars, ExistQVars,
% PseudoTypeInfo):
@@ -61,11 +61,11 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module int.
:- import_module list.
Index: compiler/purity.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/purity.m,v
retrieving revision 1.80
diff -u -b -r1.80 purity.m
--- compiler/purity.m 24 Oct 2005 04:14:25 -0000 1.80
+++ compiler/purity.m 27 Oct 2005 14:31:21 -0000
@@ -117,9 +117,9 @@
:- module check_hlds__purity.
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -163,30 +163,31 @@
:- 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__type_util.
-:- import_module check_hlds__typecheck.
-:- import_module check_hlds__unify_proc.
-:- import_module hlds__hlds_error_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__passes_aux.
-:- 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__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_util.
-:- import_module parse_tree__prog_type.
+:- 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_data.
+:- import_module hlds.hlds_error_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.passes_aux.
+:- 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.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.
Index: compiler/qual_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/qual_info.m,v
retrieving revision 1.4
diff -u -b -r1.4 qual_info.m
--- compiler/qual_info.m 24 Oct 2005 04:14:25 -0000 1.4
+++ compiler/qual_info.m 27 Oct 2005 14:31:21 -0000
@@ -12,13 +12,13 @@
:- module hlds__make_hlds__qual_info.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__equiv_type.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.equiv_type.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_data.
:- import_module recompilation.
:- import_module bool.
@@ -82,10 +82,10 @@
:- implementation.
-:- import_module hlds__hlds_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module hlds.hlds_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module map.
:- import_module std_util.
Index: compiler/quantification.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/quantification.m,v
retrieving revision 1.96
diff -u -b -r1.96 quantification.m
--- compiler/quantification.m 10 Oct 2005 07:54:37 -0000 1.96
+++ compiler/quantification.m 27 Oct 2005 14:31:21 -0000
@@ -35,9 +35,9 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module set.
@@ -121,9 +121,9 @@
:- implementation.
-:- import_module hlds__goal_util.
-:- import_module hlds__instmap.
-:- import_module parse_tree__error_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
:- import_module bool.
:- import_module enum.
Index: compiler/reassign.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/reassign.m,v
retrieving revision 1.12
diff -u -b -r1.12 reassign.m
--- compiler/reassign.m 14 Sep 2005 01:29:10 -0000 1.12
+++ compiler/reassign.m 27 Oct 2005 14:31:21 -0000
@@ -100,7 +100,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module list.
@@ -108,8 +108,8 @@
:- implementation.
-:- import_module ll_backend__code_util.
-:- import_module parse_tree__error_util.
+:- import_module libs.compiler_util.
+:- import_module ll_backend.code_util.
:- import_module map.
:- import_module require.
Index: compiler/recompilation.check.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.check.m,v
retrieving revision 1.22
diff -u -b -r1.22 recompilation.check.m
--- compiler/recompilation.check.m 24 Oct 2005 04:14:25 -0000 1.22
+++ compiler/recompilation.check.m 27 Oct 2005 14:31:21 -0000
@@ -14,9 +14,9 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_io.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_io.
:- import_module io.
:- import_module list.
@@ -58,18 +58,19 @@
:- implementation.
-:- import_module hlds__hlds_data. % for type field_access_type
-:- import_module hlds__hlds_pred. % for field_access_function_name,
+:- import_module hlds.hlds_data. % for type field_access_type
+:- import_module hlds.hlds_pred. % for field_access_function_name,
% type pred_id.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__timestamp.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module recompilation__usage.
-:- import_module recompilation__version.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.timestamp.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module recompilation.usage.
+:- import_module recompilation.version.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/recompilation.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.m,v
retrieving revision 1.15
diff -u -b -r1.15 recompilation.m
--- compiler/recompilation.m 24 Oct 2005 04:14:26 -0000 1.15
+++ compiler/recompilation.m 27 Oct 2005 14:31:21 -0000
@@ -32,9 +32,9 @@
:- import_module mdbcomp.
:- import_module parse_tree.
-:- import_module libs__timestamp.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module libs.timestamp.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module map.
@@ -247,11 +247,11 @@
:- implementation.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_util.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/recompilation.usage.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.usage.m,v
retrieving revision 1.22
diff -u -b -r1.22 recompilation.usage.m
--- compiler/recompilation.usage.m 24 Oct 2005 04:14:26 -0000 1.22
+++ compiler/recompilation.usage.m 27 Oct 2005 14:31:21 -0000
@@ -14,10 +14,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module io.
@@ -81,22 +81,22 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__timestamp.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module recompilation__version.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.timestamp.
+:- import_module mdbcomp.prim_data.
+:- 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_util.
+:- import_module recompilation.version.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/recompilation.version.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.version.m,v
retrieving revision 1.28
diff -u -b -r1.28 recompilation.version.m
--- compiler/recompilation.version.m 24 Oct 2005 04:14:26 -0000 1.28
+++ compiler/recompilation.version.m 27 Oct 2005 14:31:21 -0000
@@ -17,9 +17,9 @@
:- interface.
-:- import_module libs__timestamp.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io_util.
+:- import_module libs.timestamp.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io_util.
:- import_module io.
:- import_module std_util.
@@ -44,13 +44,13 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_out.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_out.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl.m,v
retrieving revision 1.37
diff -u -b -r1.37 rl.m
--- compiler/rl.m 24 Oct 2005 04:14:26 -0000 1.37
+++ compiler/rl.m 27 Oct 2005 14:31:21 -0000
@@ -17,12 +17,12 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -681,18 +681,18 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_data.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
-:- import_module mdbcomp__prim_data.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_data.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module int.
Index: compiler/rl_analyse.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_analyse.m,v
retrieving revision 1.8
diff -u -b -r1.8 rl_analyse.m
--- compiler/rl_analyse.m 22 Mar 2005 06:40:22 -0000 1.8
+++ compiler/rl_analyse.m 27 Oct 2005 14:31:21 -0000
@@ -13,7 +13,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
:- import_module io.
:- import_module list.
@@ -111,8 +111,8 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_block.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_block.m,v
retrieving revision 1.9
diff -u -b -r1.9 rl_block.m
--- compiler/rl_block.m 24 Oct 2005 04:14:26 -0000 1.9
+++ compiler/rl_block.m 27 Oct 2005 14:31:21 -0000
@@ -14,10 +14,10 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module int.
@@ -47,8 +47,8 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl_dump.
-:- import_module hlds__hlds_module.
+:- import_module aditi_backend.rl_dump.
+:- import_module hlds.hlds_module.
:- import_module queue.
:- import_module require.
Index: compiler/rl_block_opt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_block_opt.m,v
retrieving revision 1.16
diff -u -b -r1.16 rl_block_opt.m
--- compiler/rl_block_opt.m 24 Oct 2005 04:14:26 -0000 1.16
+++ compiler/rl_block_opt.m 27 Oct 2005 14:31:21 -0000
@@ -25,7 +25,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
:- import_module io.
:- import_module list.
@@ -41,16 +41,16 @@
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_key.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__inlining.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_key.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.inlining.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_code.m,v
retrieving revision 1.14
diff -u -b -r1.14 rl_code.m
--- compiler/rl_code.m 27 Jan 2004 12:49:27 -0000 1.14
+++ compiler/rl_code.m 27 Oct 2005 14:31:21 -0000
@@ -461,7 +461,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module backend_libs__bytecode_data.
+:- import_module backend_libs.bytecode_data.
%-----------------------------------------------------------------------------%
Index: compiler/rl_dump.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_dump.m,v
retrieving revision 1.15
diff -u -b -r1.15 rl_dump.m
--- compiler/rl_dump.m 12 Sep 2005 05:24:23 -0000 1.15
+++ compiler/rl_dump.m 27 Oct 2005 14:31:21 -0000
@@ -13,8 +13,8 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_module.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -28,10 +28,10 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
Index: compiler/rl_exprn.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_exprn.m,v
retrieving revision 1.57
diff -u -b -r1.57 rl_exprn.m
--- compiler/rl_exprn.m 24 Oct 2005 04:14:26 -0000 1.57
+++ compiler/rl_exprn.m 27 Oct 2005 14:31:21 -0000
@@ -52,12 +52,12 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_code.
-:- import_module aditi_backend__rl_file.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_code.
+:- import_module aditi_backend.rl_file.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -132,32 +132,32 @@
:- implementation.
-:- import_module aditi_backend__rl_out.
+:- import_module aditi_backend.rl_out.
:- import_module backend_libs.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_error_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_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.
-:- import_module transform_hlds__inlining.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_error_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.special_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.error_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.
+:- import_module transform_hlds.inlining.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_file.pp
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_file.pp,v
retrieving revision 1.10
diff -u -b -r1.10 rl_file.pp
--- compiler/rl_file.pp 24 Mar 2005 02:00:31 -0000 1.10
+++ compiler/rl_file.pp 27 Oct 2005 15:34:23 -0000
@@ -25,7 +25,7 @@
int::out, io__state::di, io__state::uo) is det.
#if INCLUDE_ADITI_OUTPUT % See ../Mmake.common.in.
-:- import_module aditi_backend__rl_code.
+:- import_module aditi_backend.rl_code.
:- import_module assoc_list.
:- import_module list.
Index: compiler/rl_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_gen.m,v
retrieving revision 1.24
diff -u -b -r1.24 rl_gen.m
--- compiler/rl_gen.m 24 Oct 2005 04:14:27 -0000 1.24
+++ compiler/rl_gen.m 27 Oct 2005 14:31:21 -0000
@@ -16,8 +16,8 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_module.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -27,27 +27,27 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl_info.
-:- import_module aditi_backend__rl_relops.
-:- 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__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module transform_hlds__dependency_graph.
-:- import_module transform_hlds__inlining.
-:- import_module mdbcomp__prim_data.
+:- import_module aditi_backend.rl_info.
+:- import_module aditi_backend.rl_relops.
+:- 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.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module transform_hlds.dependency_graph.
+:- import_module transform_hlds.inlining.
+:- import_module mdbcomp.prim_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_info.m,v
retrieving revision 1.13
diff -u -b -r1.13 rl_info.m
--- compiler/rl_info.m 24 Oct 2005 04:14:27 -0000 1.13
+++ compiler/rl_info.m 27 Oct 2005 14:31:21 -0000
@@ -12,11 +12,11 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__tree.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.tree.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -247,13 +247,13 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_goal.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_out.
-:- import_module mdbcomp__prim_data.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_goal.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_out.
+:- import_module mdbcomp.prim_data.
:- import_module int.
:- import_module require.
Index: compiler/rl_key.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_key.m,v
retrieving revision 1.25
diff -u -b -r1.25 rl_key.m
--- compiler/rl_key.m 24 Oct 2005 04:14:27 -0000 1.25
+++ compiler/rl_key.m 27 Oct 2005 14:31:21 -0000
@@ -17,11 +17,11 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -56,12 +56,12 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__special_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.special_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_util.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_liveness.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_liveness.m,v
retrieving revision 1.8
diff -u -b -r1.8 rl_liveness.m
--- compiler/rl_liveness.m 22 Mar 2005 06:40:23 -0000 1.8
+++ compiler/rl_liveness.m 27 Oct 2005 14:31:21 -0000
@@ -18,7 +18,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
:- import_module io.
@@ -28,8 +28,8 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_analyse.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_analyse.
:- import_module bool.
:- import_module int.
Index: compiler/rl_loop.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_loop.m,v
retrieving revision 1.7
diff -u -b -r1.7 rl_loop.m
--- compiler/rl_loop.m 22 Mar 2005 06:40:23 -0000 1.7
+++ compiler/rl_loop.m 27 Oct 2005 14:31:21 -0000
@@ -17,7 +17,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
% Given the flow graph for a procedure, return a new flow
% graph with loop invariant instructions moved out of loops.
@@ -26,7 +26,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl.
+:- import_module aditi_backend.rl.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_opt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_opt.m,v
retrieving revision 1.7
diff -u -b -r1.7 rl_opt.m
--- compiler/rl_opt.m 22 Mar 2005 06:40:23 -0000 1.7
+++ compiler/rl_opt.m 27 Oct 2005 14:31:21 -0000
@@ -12,8 +12,8 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module hlds__hlds_module.
+:- import_module aditi_backend.rl.
+:- import_module hlds.hlds_module.
:- import_module io.
:- import_module list.
@@ -25,16 +25,16 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl_block.
-:- import_module aditi_backend__rl_block_opt.
-:- import_module aditi_backend__rl_liveness.
-:- import_module aditi_backend__rl_loop.
-:- import_module aditi_backend__rl_sort.
-:- import_module aditi_backend__rl_stream.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_out.
+:- import_module aditi_backend.rl_block.
+:- import_module aditi_backend.rl_block_opt.
+:- import_module aditi_backend.rl_liveness.
+:- import_module aditi_backend.rl_loop.
+:- import_module aditi_backend.rl_sort.
+:- import_module aditi_backend.rl_stream.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_out.
:- import_module bool.
Index: compiler/rl_out.pp
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_out.pp,v
retrieving revision 1.30
diff -u -b -r1.30 rl_out.pp
--- compiler/rl_out.pp 24 Oct 2005 04:14:27 -0000 1.30
+++ compiler/rl_out.pp 27 Oct 2005 15:34:23 -0000
@@ -20,13 +20,13 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_file.
-:- import_module hlds__hlds_module.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_file.
+:- import_module hlds.hlds_module.
#if INCLUDE_ADITI_OUTPUT % See ../Mmake.common.in.
-:- import_module aditi_backend__rl_code.
-:- import_module libs__tree.
+:- import_module aditi_backend.rl_code.
+:- import_module libs.tree.
#else
#endif
@@ -64,27 +64,27 @@
:- implementation.
-:- import_module aditi_backend__magic_util.
-:- import_module aditi_backend__rl_file.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module libs__tree.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module aditi_backend.magic_util.
+:- import_module aditi_backend.rl_file.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module libs.tree.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
#if INCLUDE_ADITI_OUTPUT % See ../Mmake.common.in.
-:- import_module aditi_backend__rl_exprn.
+:- import_module aditi_backend.rl_exprn.
#else
#endif
Index: compiler/rl_relops.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_relops.m,v
retrieving revision 1.11
diff -u -b -r1.11 rl_relops.m
--- compiler/rl_relops.m 22 Mar 2005 06:40:23 -0000 1.11
+++ compiler/rl_relops.m 27 Oct 2005 14:31:21 -0000
@@ -12,11 +12,11 @@
:- interface.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_info.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_info.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -102,14 +102,14 @@
:- implementation.
-:- import_module aditi_backend__rl_key.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
+:- import_module aditi_backend.rl_key.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
:- import_module int.
:- import_module map.
Index: compiler/rl_sort.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_sort.m,v
retrieving revision 1.16
diff -u -b -r1.16 rl_sort.m
--- compiler/rl_sort.m 24 Oct 2005 04:14:27 -0000 1.16
+++ compiler/rl_sort.m 27 Oct 2005 14:31:21 -0000
@@ -34,7 +34,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
:- import_module io.
@@ -45,11 +45,11 @@
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module aditi_backend__rl_analyse.
-:- import_module aditi_backend__rl_key.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__prog_data.
+:- import_module aditi_backend.rl.
+:- import_module aditi_backend.rl_analyse.
+:- import_module aditi_backend.rl_key.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/rl_stream.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rl_stream.m,v
retrieving revision 1.12
diff -u -b -r1.12 rl_stream.m
--- compiler/rl_stream.m 22 Mar 2005 06:40:24 -0000 1.12
+++ compiler/rl_stream.m 27 Oct 2005 14:31:21 -0000
@@ -33,7 +33,7 @@
:- interface.
-:- import_module aditi_backend__rl_block.
+:- import_module aditi_backend.rl_block.
:- pred rl_stream__detect_streams(rl_opt_info, rl_opt_info).
:- mode rl_stream__detect_streams(in, out) is det.
@@ -41,7 +41,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module aditi_backend__rl.
+:- import_module aditi_backend.rl.
:- import_module assoc_list.
:- import_module bag.
Index: compiler/rtti.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rtti.m,v
retrieving revision 1.61
diff -u -b -r1.61 rtti.m
--- compiler/rtti.m 24 Oct 2005 04:14:27 -0000 1.61
+++ compiler/rtti.m 27 Oct 2005 14:31:21 -0000
@@ -26,11 +26,11 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -813,16 +813,16 @@
:- implementation.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_util. % for mercury_public_builtin_module
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util. % for mercury_public_builtin_module
:- import_module int.
:- import_module require.
Index: compiler/rtti_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rtti_out.m,v
retrieving revision 1.56
diff -u -b -r1.56 rtti_out.m
--- compiler/rtti_out.m 5 Oct 2005 06:33:52 -0000 1.56
+++ compiler/rtti_out.m 27 Oct 2005 14:31:21 -0000
@@ -25,8 +25,8 @@
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module ll_backend__llds_out.
+:- import_module backend_libs.rtti.
+:- import_module ll_backend.llds_out.
:- import_module bool.
:- import_module io.
@@ -94,24 +94,24 @@
:- implementation.
-:- import_module backend_libs__c_util.
-:- import_module backend_libs__name_mangle.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__type_ctor_info.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__layout_out.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_foreign.
-:- import_module parse_tree__prog_out.
+:- import_module backend_libs.c_util.
+:- import_module backend_libs.name_mangle.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.type_ctor_info.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.layout_out.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_foreign.
+:- import_module parse_tree.prog_out.
:- import_module assoc_list.
:- import_module counter.
Index: compiler/rtti_to_mlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/rtti_to_mlds.m,v
retrieving revision 1.63
diff -u -b -r1.63 rtti_to_mlds.m
--- compiler/rtti_to_mlds.m 24 Oct 2005 04:14:27 -0000 1.63
+++ compiler/rtti_to_mlds.m 27 Oct 2005 14:31:21 -0000
@@ -39,9 +39,9 @@
:- module ml_backend__rtti_to_mlds.
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module hlds__hlds_module.
-:- import_module ml_backend__mlds.
+:- import_module backend_libs.rtti.
+:- import_module hlds.hlds_module.
+:- import_module ml_backend.mlds.
:- import_module list.
@@ -51,21 +51,21 @@
:- implementation.
-:- import_module backend_libs__foreign.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__type_ctor_info.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module ml_backend__ml_closure_gen.
-:- import_module ml_backend__ml_code_util.
-:- import_module ml_backend__ml_unify_gen.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.foreign.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.type_ctor_info.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module ml_backend.ml_closure_gen.
+:- import_module ml_backend.ml_code_util.
+:- import_module ml_backend.ml_unify_gen.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/saved_vars.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/saved_vars.m,v
retrieving revision 1.54
diff -u -b -r1.54 saved_vars.m
--- compiler/saved_vars.m 24 Oct 2005 04:14:28 -0000 1.54
+++ compiler/saved_vars.m 27 Oct 2005 14:31:21 -0000
@@ -27,8 +27,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -41,15 +41,15 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
Index: compiler/simplify.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/simplify.m,v
retrieving revision 1.158
diff -u -b -r1.158 simplify.m
--- compiler/simplify.m 25 Oct 2005 06:33:02 -0000 1.158
+++ compiler/simplify.m 27 Oct 2005 14:31:21 -0000
@@ -31,15 +31,15 @@
:- interface.
-:- import_module check_hlds__common.
-:- import_module check_hlds__det_report.
-:- import_module check_hlds__det_util.
-:- import_module check_hlds__det_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
+:- import_module check_hlds.common.
+:- import_module check_hlds.det_report.
+:- import_module check_hlds.det_util.
+:- import_module check_hlds.det_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
:- import_module bool.
:- import_module io.
@@ -86,32 +86,32 @@
:- implementation.
-:- 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__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__quantification.
-:- import_module hlds__special_pred.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- 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_util.
-:- import_module transform_hlds__const_prop.
-:- import_module transform_hlds__pd_cost.
+:- 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.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.quantification.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module mdbcomp.prim_data.
+:- 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_util.
+:- import_module transform_hlds.const_prop.
+:- import_module transform_hlds.pd_cost.
:- import_module int.
:- import_module map.
@@ -308,7 +308,8 @@
simplify_info_set_module_info(ModuleInfo3, !Info),
simplify_info_get_det_info(!.Info, DetInfo),
- det_infer_goal(Goal3, Goal, InstMap0, SolnContext, DetInfo, _, _)
+ det_infer_goal(Goal3, Goal, InstMap0, SolnContext, [], DetInfo,
+ _, _, _)
;
Goal = Goal3
).
@@ -2211,7 +2212,7 @@
% exported for common.m
:- interface.
-:- import_module parse_tree__prog_data.
+:- import_module parse_tree.prog_data.
:- import_module set.
:- pred simplify_info_init(det_info::in, list(simplification)::in,
Index: compiler/size_prof.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/size_prof.m,v
retrieving revision 1.27
diff -u -b -r1.27 size_prof.m
--- compiler/size_prof.m 24 Oct 2005 04:14:28 -0000 1.27
+++ compiler/size_prof.m 27 Oct 2005 14:31:21 -0000
@@ -86,8 +86,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -108,24 +108,24 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__polymorphism.
-:- import_module check_hlds__simplify.
-:- 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__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__term_norm.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.polymorphism.
+:- import_module check_hlds.simplify.
+:- 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.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.term_norm.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/source_file_map.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/source_file_map.m,v
retrieving revision 1.14
diff -u -b -r1.14 source_file_map.m
--- compiler/source_file_map.m 19 Oct 2005 05:39:03 -0000 1.14
+++ compiler/source_file_map.m 27 Oct 2005 14:31:21 -0000
@@ -15,8 +15,8 @@
:- interface.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_io.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_io.
:- import_module bool.
:- import_module io.
@@ -43,11 +43,11 @@
:- implementation.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__modules.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.modules.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module char.
:- import_module dir.
Index: compiler/special_pred.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/special_pred.m,v
retrieving revision 1.55
diff -u -b -r1.55 special_pred.m
--- compiler/special_pred.m 24 Oct 2005 04:14:28 -0000 1.55
+++ compiler/special_pred.m 27 Oct 2005 14:31:21 -0000
@@ -18,11 +18,11 @@
:- module hlds__special_pred.
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module list.
:- import_module map.
@@ -106,13 +106,13 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module require.
Index: compiler/stack_alloc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/stack_alloc.m,v
retrieving revision 1.12
diff -u -b -r1.12 stack_alloc.m
--- compiler/stack_alloc.m 5 Oct 2005 06:33:53 -0000 1.12
+++ compiler/stack_alloc.m 27 Oct 2005 14:31:21 -0000
@@ -27,8 +27,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -40,22 +40,22 @@
:- implementation.
-:- import_module check_hlds__goal_path.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module libs__globals.
-:- import_module libs__graph_colour.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module ll_backend__live_vars.
-:- import_module ll_backend__liveness.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__stack_opt.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.goal_path.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module libs.globals.
+:- import_module libs.graph_colour.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.live_vars.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.stack_opt.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/stack_layout.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/stack_layout.m,v
retrieving revision 1.108
diff -u -b -r1.108 stack_layout.m
--- compiler/stack_layout.m 24 Oct 2005 04:14:28 -0000 1.108
+++ compiler/stack_layout.m 27 Oct 2005 14:31:21 -0000
@@ -29,13 +29,13 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -69,26 +69,26 @@
:- implementation.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__layout_out.
-:- import_module ll_backend__ll_pseudo_type_info.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__prog_rep.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module backend_libs.rtti.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.layout_out.
+:- import_module ll_backend.ll_pseudo_type_info.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.prog_rep.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module char.
Index: compiler/stack_opt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/stack_opt.m,v
retrieving revision 1.21
diff -u -b -r1.21 stack_opt.m
--- compiler/stack_opt.m 19 Oct 2005 05:39:03 -0000 1.21
+++ compiler/stack_opt.m 27 Oct 2005 14:31:21 -0000
@@ -73,8 +73,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -85,31 +85,31 @@
:- implementation.
-:- import_module backend_libs__interval.
-:- import_module backend_libs__matching.
-:- import_module check_hlds__goal_path.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__simplify.
-:- 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_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__call_gen.
-:- import_module ll_backend__live_vars.
-:- import_module ll_backend__liveness.
-:- import_module ll_backend__store_alloc.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_type.
+:- import_module backend_libs.interval.
+:- import_module backend_libs.matching.
+:- import_module check_hlds.goal_path.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.simplify.
+:- 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_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.call_gen.
+:- import_module ll_backend.live_vars.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.store_alloc.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/state_var.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/state_var.m,v
retrieving revision 1.6
diff -u -b -r1.6 state_var.m
--- compiler/state_var.m 5 Oct 2005 06:33:54 -0000 1.6
+++ compiler/state_var.m 27 Oct 2005 14:31:21 -0000
@@ -12,9 +12,9 @@
:- module hlds__make_hlds__state_var.
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module io.
:- import_module list.
@@ -295,8 +295,9 @@
:- implementation.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_util.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.prog_util.
:- import_module char.
:- import_module int.
Index: compiler/store_alloc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/store_alloc.m,v
retrieving revision 1.92
diff -u -b -r1.92 store_alloc.m
--- compiler/store_alloc.m 30 Sep 2005 08:08:34 -0000 1.92
+++ compiler/store_alloc.m 27 Oct 2005 14:31:21 -0000
@@ -28,8 +28,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- type store_map_run_type
---> final_allocation
@@ -43,20 +43,20 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__instmap.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__follow_vars.
-:- import_module ll_backend__liveness.
-:- import_module ll_backend__llds.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.instmap.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.follow_vars.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.llds.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/stratify.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/stratify.m,v
retrieving revision 1.42
diff -u -b -r1.42 stratify.m
--- compiler/stratify.m 24 Oct 2005 04:14:29 -0000 1.42
+++ compiler/stratify.m 27 Oct 2005 14:31:21 -0000
@@ -32,7 +32,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -46,20 +46,20 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
-:- import_module transform_hlds__dependency_graph.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
+:- import_module transform_hlds.dependency_graph.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/string_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/string_switch.m,v
retrieving revision 1.49
diff -u -b -r1.49 string_switch.m
--- compiler/string_switch.m 24 Oct 2005 04:14:29 -0000 1.49
+++ compiler/string_switch.m 27 Oct 2005 14:31:21 -0000
@@ -19,13 +19,13 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- pred generate_string_switch(cases_list::in, prog_var::in, code_model::in,
can_fail::in, hlds_goal_info::in, label::in,
@@ -36,12 +36,12 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__trace.
+:- import_module backend_libs.builtin_ops.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.trace.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/superhomogeneous.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/superhomogeneous.m,v
retrieving revision 1.7
diff -u -b -r1.7 superhomogeneous.m
--- compiler/superhomogeneous.m 24 Oct 2005 04:14:29 -0000 1.7
+++ compiler/superhomogeneous.m 27 Oct 2005 14:31:21 -0000
@@ -18,13 +18,13 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__hlds_module.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module hlds__make_hlds__state_var.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module hlds.make_hlds.state_var.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module io.
@@ -109,21 +109,22 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__purity.
-:- import_module hlds__goal_util.
-:- import_module hlds__make_hlds__add_clause.
-:- import_module hlds__make_hlds__field_access.
-:- import_module hlds__make_hlds__qual_info.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__module_qual.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_io_goal.
-:- import_module parse_tree__prog_io_dcg.
-:- import_module parse_tree__prog_io_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.purity.
+:- import_module hlds.goal_util.
+:- import_module hlds.make_hlds.add_clause.
+:- import_module hlds.make_hlds.field_access.
+:- import_module hlds.make_hlds.qual_info.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.module_qual.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_io_dcg.
+:- import_module parse_tree.prog_io_goal.
+:- import_module parse_tree.prog_io_util.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module int.
Index: compiler/switch_detection.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/switch_detection.m,v
retrieving revision 1.114
diff -u -b -r1.114 switch_detection.m
--- compiler/switch_detection.m 24 Oct 2005 04:14:29 -0000 1.114
+++ compiler/switch_detection.m 27 Oct 2005 14:31:21 -0000
@@ -18,10 +18,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -58,18 +58,18 @@
:- implementation.
-:- 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 parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
+:- 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.compiler_util.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
:- import_module assoc_list.
:- import_module char.
Index: compiler/switch_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/switch_gen.m,v
retrieving revision 1.89
diff -u -b -r1.89 switch_gen.m
--- compiler/switch_gen.m 24 Oct 2005 04:14:29 -0000 1.89
+++ compiler/switch_gen.m 27 Oct 2005 14:31:21 -0000
@@ -47,12 +47,12 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -64,20 +64,20 @@
:- implementation.
-:- import_module backend_libs__switch_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_llds.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__dense_switch.
-:- import_module ll_backend__lookup_switch.
-:- import_module ll_backend__string_switch.
-:- import_module ll_backend__tag_switch.
-:- import_module ll_backend__trace.
-:- import_module ll_backend__unify_gen.
+:- import_module backend_libs.switch_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_llds.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.dense_switch.
+:- import_module ll_backend.lookup_switch.
+:- import_module ll_backend.string_switch.
+:- import_module ll_backend.tag_switch.
+:- import_module ll_backend.trace.
+:- import_module ll_backend.unify_gen.
:- import_module bool.
:- import_module int.
Index: compiler/switch_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/switch_util.m,v
retrieving revision 1.25
diff -u -b -r1.25 switch_util.m
--- compiler/switch_util.m 24 Oct 2005 04:14:29 -0000 1.25
+++ compiler/switch_util.m 27 Oct 2005 14:31:21 -0000
@@ -17,11 +17,11 @@
:- module backend_libs__switch_util.
:- interface.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module list.
@@ -147,8 +147,8 @@
:- implementation.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_type.
:- import_module char.
:- import_module int.
Index: compiler/table_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/table_gen.m,v
retrieving revision 1.95
diff -u -b -r1.95 table_gen.m
--- compiler/table_gen.m 24 Oct 2005 04:14:29 -0000 1.95
+++ compiler/table_gen.m 27 Oct 2005 14:31:21 -0000
@@ -39,7 +39,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -51,37 +51,38 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__rtti.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__modes.
-:- import_module check_hlds__polymorphism.
-:- 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_data.
-:- import_module hlds__hlds_error_util.
-:- 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__passes_aux.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module backend_libs.rtti.
+:- 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.purity.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.goal_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_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
:- import_module ll_backend.
-:- import_module ll_backend__continuation_info.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module parse_tree__prog_type.
-:- import_module transform_hlds__const_prop.
+:- import_module ll_backend.continuation_info.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.error_util.
+:- 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_util.
+:- import_module transform_hlds.const_prop.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/tag_switch.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/tag_switch.m,v
retrieving revision 1.65
diff -u -b -r1.65 tag_switch.m
--- compiler/tag_switch.m 24 Oct 2005 04:14:30 -0000 1.65
+++ compiler/tag_switch.m 27 Oct 2005 14:31:21 -0000
@@ -16,13 +16,13 @@
:- interface.
-:- import_module backend_libs__switch_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.switch_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module list.
@@ -35,19 +35,19 @@
:- implementation.
-:- import_module backend_libs__builtin_ops.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_gen.
-:- import_module ll_backend__trace.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.builtin_ops.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_gen.
+:- import_module ll_backend.trace.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/term_constr_build.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_build.m,v
retrieving revision 1.1
diff -u -b -r1.1 term_constr_build.m
--- compiler/term_constr_build.m 7 Apr 2005 06:32:15 -0000 1.1
+++ compiler/term_constr_build.m 27 Oct 2005 14:31:21 -0000
@@ -61,25 +61,25 @@
:- import_module check_hlds.mode_util.
:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.lp_rational.
:- import_module libs.options.
:- import_module libs.polyhedron.
:- import_module libs.rat.
-:- import_module transform_hlds.dependency_graph.
-:- import_module transform_hlds.term_constr_util.
-:- import_module transform_hlds.term_constr_data.
-:- import_module transform_hlds.term_constr_errors.
-:- import_module transform_hlds.term_constr_main.
-:- import_module hlds.hlds_data.
-:- import_module hlds.hlds_goal.
-:- import_module hlds.quantification.
-:- import_module hlds.hlds_out.
-:- import_module parse_tree.error_util.
:- import_module parse_tree.mercury_to_mercury.
:- import_module parse_tree.modules.
:- import_module parse_tree.prog_data.
:- import_module parse_tree.prog_type.
+:- import_module transform_hlds.dependency_graph.
+:- import_module transform_hlds.term_constr_data.
+:- import_module transform_hlds.term_constr_errors.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_constr_util.
:- import_module assoc_list.
:- import_module counter.
Index: compiler/term_constr_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_data.m,v
retrieving revision 1.1
diff -u -b -r1.1 term_constr_data.m
--- compiler/term_constr_data.m 7 Apr 2005 06:32:15 -0000 1.1
+++ compiler/term_constr_data.m 27 Oct 2005 14:31:22 -0000
@@ -388,7 +388,7 @@
:- import_module hlds.hlds_pred.
:- import_module hlds.hlds_out.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module parse_tree.prog_data.
:- import_module transform_hlds.term_constr_util.
Index: compiler/term_constr_fixpoint.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_fixpoint.m,v
retrieving revision 1.1
diff -u -b -r1.1 term_constr_fixpoint.m
--- compiler/term_constr_fixpoint.m 7 Apr 2005 06:32:15 -0000 1.1
+++ compiler/term_constr_fixpoint.m 27 Oct 2005 14:31:22 -0000
@@ -57,18 +57,18 @@
:- implementation.
:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.lp_rational.
:- import_module libs.options.
:- import_module libs.polyhedron.
-:- import_module hlds.hlds_data.
-:- import_module hlds.hlds_goal.
-:- import_module hlds.hlds_out.
-:- import_module parse_tree.error_util.
:- import_module parse_tree.prog_data.
:- import_module transform_hlds.term_constr_data.
-:- import_module transform_hlds.term_constr_util.
:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_constr_util.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/term_constr_initial.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_initial.m,v
retrieving revision 1.6
diff -u -b -r1.6 term_constr_initial.m
--- compiler/term_constr_initial.m 5 Oct 2005 06:33:57 -0000 1.6
+++ compiler/term_constr_initial.m 27 Oct 2005 14:31:22 -0000
@@ -57,34 +57,29 @@
:- 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_goal.
-:- import_module hlds.hlds_pred.
:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
:- import_module hlds.passes_aux.
:- import_module hlds.special_pred.
-
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.lp_rational.
:- import_module libs.options.
:- import_module libs.polyhedron.
:- import_module libs.rat.
-
:- import_module mdbcomp.prim_data.
-
-:- import_module parse_tree.error_util.
:- import_module parse_tree.mercury_to_mercury.
:- import_module parse_tree.modules.
:- import_module parse_tree.prog_data.
:- import_module parse_tree.prog_out.
:- import_module parse_tree.prog_util.
-
-:- import_module transform_hlds.term_constr_main.
:- import_module transform_hlds.dependency_graph.
-:- import_module transform_hlds.term_constr_util.
-:- import_module transform_hlds.term_constr_errors.
:- import_module transform_hlds.term_constr_data.
+:- import_module transform_hlds.term_constr_errors.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.term_constr_util.
:- import_module transform_hlds.term_norm.
:- import_module bool.
Index: compiler/term_constr_pass2.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_pass2.m,v
retrieving revision 1.1
diff -u -b -r1.1 term_constr_pass2.m
--- compiler/term_constr_pass2.m 7 Apr 2005 06:32:16 -0000 1.1
+++ compiler/term_constr_pass2.m 27 Oct 2005 14:31:22 -0000
@@ -56,12 +56,12 @@
:- import_module hlds.hlds_module.
:- import_module hlds.hlds_out.
:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.lp_rational.
:- import_module libs.options.
:- import_module libs.polyhedron.
:- import_module libs.rat.
-:- import_module parse_tree.error_util.
:- import_module parse_tree.mercury_to_mercury.
:- import_module parse_tree.prog_data.
:- import_module transform_hlds.term_constr_data.
Index: compiler/term_constr_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_constr_util.m,v
retrieving revision 1.4
diff -u -b -r1.4 term_constr_util.m
--- compiler/term_constr_util.m 24 Oct 2005 04:14:30 -0000 1.4
+++ compiler/term_constr_util.m 27 Oct 2005 14:31:22 -0000
@@ -200,17 +200,17 @@
:- implementation.
-:- import_module check_hlds.type_util.
:- import_module check_hlds.mode_util.
-:- import_module libs.options.
-:- import_module libs.globals.
-:- import_module libs.rat.
+:- import_module check_hlds.type_util.
:- import_module hlds.hlds_goal.
:- import_module hlds.hlds_module.
:- import_module hlds.hlds_out.
:- import_module hlds.hlds_pred.
:- import_module hlds.quantification.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.rat.
:- import_module parse_tree.mercury_to_mercury.
:- import_module parse_tree.prog_type.
:- import_module transform_hlds.term_constr_errors.
Index: compiler/term_errors.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_errors.m,v
retrieving revision 1.31
diff -u -b -r1.31 term_errors.m
--- compiler/term_errors.m 24 Oct 2005 04:14:30 -0000 1.31
+++ compiler/term_errors.m 27 Oct 2005 14:31:22 -0000
@@ -18,9 +18,9 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bag.
@@ -158,15 +158,15 @@
:- implementation.
-:- import_module hlds__hlds_error_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_out.
-:- import_module transform_hlds__term_util.
+:- import_module hlds.hlds_error_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_out.
+:- import_module transform_hlds.term_util.
:- import_module bag.
:- import_module bool.
Index: compiler/term_norm.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_norm.m,v
retrieving revision 1.13
diff -u -b -r1.13 term_norm.m
--- compiler/term_norm.m 24 Oct 2005 04:14:30 -0000 1.13
+++ compiler/term_norm.m 27 Oct 2005 14:31:22 -0000
@@ -15,10 +15,10 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module libs__globals.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module libs.globals.
+:- import_module parse_tree.prog_data.
:- import_module int.
:- import_module list.
@@ -71,14 +71,14 @@
:- 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 libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- 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 libs.compiler_util.
+:- import_module libs.options.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/term_pass1.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_pass1.m,v
retrieving revision 1.22
diff -u -b -r1.22 term_pass1.m
--- compiler/term_pass1.m 24 Oct 2005 04:14:30 -0000 1.22
+++ compiler/term_pass1.m 27 Oct 2005 14:31:22 -0000
@@ -24,10 +24,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module transform_hlds__term_errors.
-:- import_module transform_hlds__term_util.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module transform_hlds.term_errors.
+:- import_module transform_hlds.term_util.
:- import_module io.
:- import_module list.
@@ -55,14 +55,14 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module libs__lp.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__term_traversal.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module libs.compiler_util.
+:- import_module libs.lp.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.term_traversal.
:- import_module bag.
:- import_module bool.
Index: compiler/term_pass2.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_pass2.m,v
retrieving revision 1.20
diff -u -b -r1.20 term_pass2.m
--- compiler/term_pass2.m 24 Oct 2005 04:14:30 -0000 1.20
+++ compiler/term_pass2.m 27 Oct 2005 14:31:22 -0000
@@ -18,9 +18,9 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module transform_hlds__term_util.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module transform_hlds.term_util.
:- import_module list.
@@ -35,13 +35,13 @@
:- implementation.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_goal.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__term_traversal.
-:- import_module transform_hlds__term_errors.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_goal.
+:- import_module libs.compiler_util.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.term_errors.
+:- import_module transform_hlds.term_traversal.
:- import_module assoc_list.
:- import_module bag.
Index: compiler/term_traversal.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_traversal.m,v
retrieving revision 1.38
diff -u -b -r1.38 term_traversal.m
--- compiler/term_traversal.m 24 Oct 2005 04:14:31 -0000 1.38
+++ compiler/term_traversal.m 27 Oct 2005 14:31:22 -0000
@@ -112,7 +112,7 @@
:- import_module check_hlds.type_util.
:- import_module hlds.hlds_data.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module parse_tree.prog_type.
:- import_module assoc_list.
Index: compiler/term_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/term_util.m,v
retrieving revision 1.43
diff -u -b -r1.43 term_util.m
--- compiler/term_util.m 24 Oct 2005 04:14:31 -0000 1.43
+++ compiler/term_util.m 27 Oct 2005 14:31:22 -0000
@@ -18,12 +18,12 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
-:- import_module transform_hlds__term_errors.
-:- import_module transform_hlds__term_norm.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
+:- import_module transform_hlds.term_errors.
+:- import_module transform_hlds.term_norm.
:- import_module bag.
:- import_module bool.
@@ -161,14 +161,14 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_type.
:- import_module assoc_list.
:- import_module require.
Index: compiler/termination.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/termination.m,v
retrieving revision 1.55
diff -u -b -r1.55 termination.m
--- compiler/termination.m 24 Oct 2005 04:14:31 -0000 1.55
+++ compiler/termination.m 27 Oct 2005 14:31:22 -0000
@@ -46,8 +46,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -67,31 +67,32 @@
:- 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_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__passes_aux.
-:- import_module hlds__special_pred.
-:- 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__modules.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_out.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__dependency_graph.
-:- import_module transform_hlds__post_term_analysis.
-:- import_module transform_hlds__term_errors.
-:- import_module transform_hlds__term_norm.
-:- import_module transform_hlds__term_pass1.
-:- import_module transform_hlds__term_pass2.
-:- import_module transform_hlds__term_util.
+:- 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_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.passes_aux.
+:- import_module hlds.special_pred.
+:- 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.modules.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_out.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.dependency_graph.
+:- import_module transform_hlds.post_term_analysis.
+:- import_module transform_hlds.term_errors.
+:- import_module transform_hlds.term_norm.
+:- import_module transform_hlds.term_pass1.
+:- import_module transform_hlds.term_pass2.
+:- import_module transform_hlds.term_util.
:- import_module bag.
:- import_module bool.
Index: compiler/trace.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/trace.m,v
retrieving revision 1.76
diff -u -b -r1.76 trace.m
--- compiler/trace.m 24 Oct 2005 04:14:31 -0000 1.76
+++ compiler/trace.m 27 Oct 2005 14:31:22 -0000
@@ -48,13 +48,13 @@
:- interface.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- import_module map.
:- import_module set.
@@ -225,22 +225,22 @@
:- implementation.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__instmap.
-:- import_module libs__options.
-:- import_module libs__trace_params.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__layout_out.
-:- import_module ll_backend__llds_out.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.instmap.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module libs.trace_params.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.layout_out.
+:- import_module ll_backend.llds_out.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module int.
Index: compiler/trace_params.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/trace_params.m,v
retrieving revision 1.26
diff -u -b -r1.26 trace_params.m
--- compiler/trace_params.m 5 Oct 2005 06:33:58 -0000 1.26
+++ compiler/trace_params.m 27 Oct 2005 14:31:22 -0000
@@ -38,8 +38,8 @@
:- interface.
:- import_module hlds.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module std_util.
@@ -112,9 +112,9 @@
:- implementation.
-:- import_module hlds__special_pred.
+:- import_module hlds.special_pred.
:- import_module mdbcomp.
-:- import_module mdbcomp__prim_data.
+:- import_module mdbcomp.prim_data.
:- import_module char.
:- import_module int.
Index: compiler/trans_opt.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/trans_opt.m,v
retrieving revision 1.31
diff -u -b -r1.31 trans_opt.m
--- compiler/trans_opt.m 19 Oct 2005 05:39:04 -0000 1.31
+++ compiler/trans_opt.m 27 Oct 2005 14:31:22 -0000
@@ -52,9 +52,9 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__modules.
+:- import_module hlds.hlds_module.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.modules.
:- import_module bool.
:- import_module io.
@@ -78,19 +78,19 @@
:- implementation.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__passes_aux.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module transform_hlds__intermod.
-:- import_module transform_hlds__term_constr_main.
-:- import_module transform_hlds__termination.
-:- import_module transform_hlds__exception_analysis.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.passes_aux.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module transform_hlds.intermod.
+:- import_module transform_hlds.term_constr_main.
+:- import_module transform_hlds.termination.
+:- import_module transform_hlds.exception_analysis.
:- import_module list.
:- import_module map.
Index: compiler/transform.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/transform.m,v
retrieving revision 1.22
diff -u -b -r1.22 transform.m
--- compiler/transform.m 19 Oct 2005 05:39:04 -0000 1.22
+++ compiler/transform.m 27 Oct 2005 14:31:22 -0000
@@ -34,8 +34,8 @@
:- module transform_hlds__transform.
:- interface.
-:- import_module check_hlds__mode_info.
-:- import_module hlds__hlds_goal.
+:- import_module check_hlds.mode_info.
+:- import_module hlds.hlds_goal.
:- import_module list.
@@ -47,10 +47,10 @@
:- implementation.
-:- import_module check_hlds__delay_info.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__instmap.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.delay_info.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.instmap.
+:- import_module parse_tree.prog_data.
:- import_module map.
:- import_module require.
Index: compiler/transform_llds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/transform_llds.m,v
retrieving revision 1.18
diff -u -b -r1.18 transform_llds.m
--- compiler/transform_llds.m 24 Oct 2005 04:14:31 -0000 1.18
+++ compiler/transform_llds.m 27 Oct 2005 14:31:22 -0000
@@ -25,7 +25,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module io.
:- pred transform_llds(c_file::in, c_file::out, io::di, io::uo) is det.
@@ -34,14 +34,14 @@
:- implementation.
-:- import_module hlds__hlds_pred.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__proc_label.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module ll_backend__opt_util.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_pred.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.proc_label.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module ll_backend.opt_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module counter.
Index: compiler/tupling.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/tupling.m,v
retrieving revision 1.14
diff -u -b -r1.14 tupling.m
--- compiler/tupling.m 24 Oct 2005 04:14:31 -0000 1.14
+++ compiler/tupling.m 27 Oct 2005 14:31:22 -0000
@@ -86,7 +86,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -98,34 +98,34 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__interval.
-:- import_module check_hlds__goal_path.
-:- 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_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
+:- import_module backend_libs.interval.
+:- import_module check_hlds.goal_path.
+:- 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_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.quantification.
+:- 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__live_vars.
-:- import_module ll_backend__liveness.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.call_gen.
+:- import_module ll_backend.liveness.
+:- import_module ll_backend.live_vars.
+:- import_module mdbcomp.prim_data.
+:- import_module mdbcomp.trace_counts.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
+:- import_module transform_hlds.dependency_graph.
:- use_module mdbcomp__program_representation.
-:- import_module mdbcomp__trace_counts.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
-:- import_module transform_hlds__dependency_graph.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/type_class_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/type_class_info.m,v
retrieving revision 1.12
diff -u -b -r1.12 type_class_info.m
--- compiler/type_class_info.m 24 Oct 2005 04:14:31 -0000 1.12
+++ compiler/type_class_info.m 27 Oct 2005 14:31:22 -0000
@@ -22,9 +22,9 @@
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module hlds__hlds_module.
-:- import_module parse_tree__prog_data.
+:- import_module backend_libs.rtti.
+:- import_module hlds.hlds_module.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -38,17 +38,17 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_io.
-:- import_module parse_tree__prog_out.
-:- import_module backend_libs__pseudo_type_info.
-:- import_module backend_libs__base_typeclass_info.
+:- import_module check_hlds.type_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_io.
+:- import_module parse_tree.prog_out.
+:- import_module backend_libs.pseudo_type_info.
+:- import_module backend_libs.base_typeclass_info.
:- import_module assoc_list.
:- import_module int.
Index: compiler/type_ctor_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/type_ctor_info.m,v
retrieving revision 1.71
diff -u -b -r1.71 type_ctor_info.m
--- compiler/type_ctor_info.m 24 Oct 2005 04:14:31 -0000 1.71
+++ compiler/type_ctor_info.m 27 Oct 2005 14:31:22 -0000
@@ -37,8 +37,8 @@
:- interface.
-:- import_module backend_libs__rtti.
-:- import_module hlds__hlds_module.
+:- import_module backend_libs.rtti.
+:- import_module hlds.hlds_module.
:- import_module list.
@@ -59,27 +59,27 @@
:- 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__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__make_tags.
-:- import_module hlds__special_pred.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module mdbcomp__prim_data.
-:- 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 parse_tree__prog_util.
+:- 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.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.make_tags.
+:- import_module hlds.special_pred.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module mdbcomp.prim_data.
+:- 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/mercury/mercury1/repository/mercury/compiler/type_util.m,v
retrieving revision 1.158
diff -u -b -r1.158 type_util.m
--- compiler/type_util.m 24 Oct 2005 04:14:32 -0000 1.158
+++ compiler/type_util.m 27 Oct 2005 14:31:22 -0000
@@ -20,12 +20,12 @@
:- interface.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module libs.globals.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module list.
@@ -492,15 +492,15 @@
:- implementation.
:- import_module backend_libs.
-:- import_module backend_libs__foreign.
-:- import_module check_hlds__purity.
-:- import_module hlds__hlds_out.
-:- 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 backend_libs.foreign.
+:- import_module check_hlds.purity.
+:- import_module hlds.hlds_out.
+:- 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 assoc_list.
:- import_module bool.
Index: compiler/typecheck.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/typecheck.m,v
retrieving revision 1.382
diff -u -b -r1.382 typecheck.m
--- compiler/typecheck.m 25 Oct 2005 13:08:26 -0000 1.382
+++ compiler/typecheck.m 27 Oct 2005 14:31:22 -0000
@@ -80,10 +80,10 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -123,31 +123,32 @@
:- 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_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__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__mercury_to_mercury.
-:- import_module parse_tree__modules.
-:- 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_util.
-:- import_module parse_tree__prog_type.
+:- import_module check_hlds.clause_to_proc.
+:- import_module check_hlds.goal_path.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.typecheck_errors.
+:- import_module check_hlds.typecheck_info.
+:- import_module check_hlds.typeclasses.
+:- import_module check_hlds.type_util.
+:- import_module hlds.goal_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.passes_aux.
+:- import_module hlds.special_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.error_util.
+:- import_module parse_tree.mercury_to_mercury.
+:- import_module parse_tree.modules.
+:- 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_util.
:- import_module assoc_list.
:- import_module getopt_io.
Index: compiler/typecheck_errors.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/typecheck_errors.m,v
retrieving revision 1.9
diff -u -b -r1.9 typecheck_errors.m
--- compiler/typecheck_errors.m 25 Oct 2005 06:33:03 -0000 1.9
+++ compiler/typecheck_errors.m 27 Oct 2005 14:31:22 -0000
@@ -103,6 +103,7 @@
:- import_module hlds.hlds_error_util.
:- import_module hlds.hlds_goal.
:- import_module hlds.hlds_out.
+:- import_module libs.compiler_util.
:- import_module libs.globals.
:- import_module libs.options.
:- import_module parse_tree.error_util.
Index: compiler/typecheck_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/typecheck_info.m,v
retrieving revision 1.4
diff -u -b -r1.4 typecheck_info.m
--- compiler/typecheck_info.m 24 Oct 2005 04:14:32 -0000 1.4
+++ compiler/typecheck_info.m 27 Oct 2005 14:31:22 -0000
@@ -300,7 +300,7 @@
:- implementation.
:- import_module check_hlds.type_util.
-:- import_module parse_tree.error_util.
+:- import_module libs.compiler_util.
:- import_module parse_tree.mercury_to_mercury.
:- import_module parse_tree.prog_type.
:- import_module parse_tree.prog_util.
Index: compiler/unify_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/unify_gen.m,v
retrieving revision 1.156
diff -u -b -r1.156 unify_gen.m
--- compiler/unify_gen.m 24 Oct 2005 04:14:33 -0000 1.156
+++ compiler/unify_gen.m 27 Oct 2005 14:31:22 -0000
@@ -20,11 +20,11 @@
:- interface.
-:- import_module hlds__code_model.
-:- import_module hlds__hlds_goal.
-:- import_module ll_backend__code_info.
-:- import_module ll_backend__llds.
-:- import_module parse_tree__prog_data.
+:- import_module hlds.code_model.
+:- import_module hlds.hlds_goal.
+:- import_module ll_backend.code_info.
+:- import_module ll_backend.llds.
+:- import_module parse_tree.prog_data.
:- type test_sense
---> branch_on_success
@@ -40,31 +40,31 @@
:- implementation.
-:- import_module aditi_backend__rl.
-:- import_module backend_libs__builtin_ops.
-:- import_module backend_libs__proc_label.
-:- import_module backend_libs__rtti.
-:- import_module backend_libs__type_class_info.
-:- import_module check_hlds__mode_util.
-:- import_module check_hlds__type_util.
-:- import_module hlds__arg_info.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__continuation_info.
-:- import_module ll_backend__layout.
-:- import_module ll_backend__llds_out.
-:- import_module ll_backend__stack_layout.
-:- 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 mdbcomp__prim_data.
+:- import_module aditi_backend.rl.
+:- import_module backend_libs.builtin_ops.
+:- import_module backend_libs.proc_label.
+:- import_module backend_libs.rtti.
+:- import_module backend_libs.type_class_info.
+:- import_module check_hlds.mode_util.
+:- import_module check_hlds.type_util.
+:- import_module hlds.arg_info.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module libs.compiler_util.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.continuation_info.
+:- import_module ll_backend.layout.
+:- import_module ll_backend.llds_out.
+:- import_module ll_backend.stack_layout.
+:- import_module mdbcomp.prim_data.
+:- 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.
Index: compiler/unify_proc.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/unify_proc.m,v
retrieving revision 1.154
diff -u -b -r1.154 unify_proc.m
--- compiler/unify_proc.m 24 Oct 2005 04:14:33 -0000 1.154
+++ compiler/unify_proc.m 27 Oct 2005 14:31:22 -0000
@@ -48,13 +48,13 @@
:- interface.
-:- import_module check_hlds__mode_info.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_info.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -132,33 +132,33 @@
:- implementation.
-:- 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__mode_util.
-:- import_module check_hlds__modes.
-:- 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.
-:- import_module hlds__goal_util.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__make_hlds.
-:- import_module hlds__quantification.
-:- import_module hlds__special_pred.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- 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_util.
-:- import_module parse_tree__prog_type.
+:- 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.
+:- import_module hlds.goal_util.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.make_hlds.
+:- import_module hlds.quantification.
+:- import_module hlds.special_pred.
+:- 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/mercury/mercury1/repository/mercury/compiler/unique_modes.m,v
retrieving revision 1.97
diff -u -b -r1.97 unique_modes.m
--- compiler/unique_modes.m 24 Oct 2005 04:14:33 -0000 1.97
+++ compiler/unique_modes.m 27 Oct 2005 14:31:22 -0000
@@ -33,11 +33,11 @@
:- module check_hlds__unique_modes.
:- interface.
-:- import_module check_hlds__mode_info.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.mode_info.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
+:- import_module parse_tree.prog_data.
:- import_module bool.
:- import_module io.
@@ -73,24 +73,24 @@
:- implementation.
-:- 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_util.
-:- import_module check_hlds__modecheck_call.
-:- import_module check_hlds__modecheck_unify.
-:- import_module check_hlds__modes.
-:- 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 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 mdbcomp__prim_data.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.inst_util.
+:- import_module check_hlds.modecheck_call.
+:- 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.compiler_util.
+:- 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.
Index: compiler/unneeded_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/unneeded_code.m,v
retrieving revision 1.25
diff -u -b -r1.25 unneeded_code.m
--- compiler/unneeded_code.m 24 Oct 2005 04:14:34 -0000 1.25
+++ compiler/unneeded_code.m 27 Oct 2005 14:31:22 -0000
@@ -59,8 +59,8 @@
:- interface.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_pred.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_pred.
:- import_module io.
@@ -73,18 +73,18 @@
:- implementation.
-:- import_module check_hlds__goal_path.
-:- import_module check_hlds__inst_match.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__goal_form.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__instmap.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module libs__globals.
-:- import_module libs__options.
-:- import_module parse_tree__prog_data.
+:- import_module check_hlds.goal_path.
+:- import_module check_hlds.inst_match.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.goal_form.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.instmap.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module libs.globals.
+:- import_module libs.options.
+:- import_module parse_tree.prog_data.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/untupling.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/untupling.m,v
retrieving revision 1.9
diff -u -b -r1.9 untupling.m
--- compiler/untupling.m 24 Oct 2005 04:14:34 -0000 1.9
+++ compiler/untupling.m 27 Oct 2005 14:31:22 -0000
@@ -92,7 +92,7 @@
:- interface.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -103,18 +103,18 @@
:- implementation.
-:- import_module check_hlds__det_analysis.
-:- import_module check_hlds__mode_util.
-:- import_module hlds__hlds_data.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__quantification.
-:- import_module mdbcomp__prim_data.
-:- import_module parse_tree__error_util.
-:- import_module parse_tree__prog_data.
-:- import_module parse_tree__prog_mode.
-:- import_module parse_tree__prog_type.
-:- import_module parse_tree__prog_util.
+:- import_module check_hlds.det_analysis.
+:- import_module check_hlds.mode_util.
+:- import_module hlds.hlds_data.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.quantification.
+:- import_module libs.compiler_util.
+:- import_module mdbcomp.prim_data.
+:- import_module parse_tree.prog_data.
+:- import_module parse_tree.prog_mode.
+:- import_module parse_tree.prog_type.
+:- import_module parse_tree.prog_util.
:- import_module bool.
:- import_module counter.
Index: compiler/unused_args.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/unused_args.m,v
retrieving revision 1.111
diff -u -b -r1.111 unused_args.m
--- compiler/unused_args.m 24 Oct 2005 04:14:34 -0000 1.111
+++ compiler/unused_args.m 27 Oct 2005 14:31:22 -0000
@@ -49,7 +49,7 @@
:- interface.
:- import_module analysis.
-:- import_module hlds__hlds_module.
+:- import_module hlds.hlds_module.
:- import_module io.
@@ -70,31 +70,32 @@
:- implementation.
-:- 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_goal.
-:- import_module hlds__hlds_out.
-:- import_module hlds__hlds_pred.
-:- import_module hlds__instmap.
-:- import_module hlds__make_hlds.
-:- import_module hlds__passes_aux.
-:- import_module hlds__quantification.
-:- import_module hlds__special_pred.
-:- 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__modules.
-:- 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 transform_hlds__mmc_analysis.
+:- 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_goal.
+:- import_module hlds.hlds_out.
+:- import_module hlds.hlds_pred.
+:- import_module hlds.instmap.
+:- import_module hlds.make_hlds.
+:- import_module hlds.passes_aux.
+:- import_module hlds.quantification.
+:- import_module hlds.special_pred.
+:- 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.modules.
+:- 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 transform_hlds.mmc_analysis.
:- import_module assoc_list.
:- import_module bool.
Index: compiler/use_local_vars.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/use_local_vars.m,v
retrieving revision 1.17
diff -u -b -r1.17 use_local_vars.m
--- compiler/use_local_vars.m 14 Sep 2005 01:29:10 -0000 1.17
+++ compiler/use_local_vars.m 27 Oct 2005 14:31:22 -0000
@@ -63,8 +63,8 @@
:- interface.
-:- import_module ll_backend__llds.
-:- import_module mdbcomp__prim_data.
+:- import_module ll_backend.llds.
+:- import_module mdbcomp.prim_data.
:- import_module bool.
:- import_module counter.
@@ -76,13 +76,13 @@
:- implementation.
-:- import_module ll_backend__basic_block.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__exprn_aux.
-:- import_module ll_backend__livemap.
-:- import_module ll_backend__opt_debug.
-:- import_module ll_backend__opt_util.
-:- import_module parse_tree__error_util.
+:- import_module ll_backend.basic_block.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.exprn_aux.
+:- import_module ll_backend.livemap.
+:- import_module ll_backend.opt_debug.
+:- import_module ll_backend.opt_util.
+:- import_module parse_tree.error_util.
:- import_module int.
:- import_module map.
Index: compiler/var_locn.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/var_locn.m,v
retrieving revision 1.29
diff -u -b -r1.29 var_locn.m
--- compiler/var_locn.m 24 Oct 2005 04:14:34 -0000 1.29
+++ compiler/var_locn.m 27 Oct 2005 14:31:22 -0000
@@ -21,14 +21,14 @@
:- interface.
-:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_module.
-:- import_module hlds__hlds_goal.
-:- import_module hlds__hlds_llds.
-:- import_module hlds__hlds_pred.
-:- import_module ll_backend__global_data.
-:- import_module ll_backend__llds.
-:- import_module libs__options.
+:- import_module parse_tree.prog_data.
+:- import_module hlds.hlds_module.
+:- import_module hlds.hlds_goal.
+:- import_module hlds.hlds_llds.
+:- import_module hlds.hlds_pred.
+:- import_module ll_backend.global_data.
+:- import_module ll_backend.llds.
+:- import_module libs.options.
:- import_module assoc_list.
:- import_module bool.
@@ -355,12 +355,12 @@
:- implementation.
-:- import_module check_hlds__type_util.
-:- import_module libs__options.
-:- import_module libs__tree.
-:- import_module ll_backend__code_util.
-:- import_module ll_backend__exprn_aux.
-:- import_module parse_tree__error_util.
+:- import_module check_hlds.type_util.
+:- import_module libs.compiler_util.
+:- import_module libs.options.
+:- import_module libs.tree.
+:- import_module ll_backend.code_util.
+:- import_module ll_backend.exprn_aux.
:- import_module bag.
:- import_module getopt_io.
Index: compiler/wrap_blocks.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/wrap_blocks.m,v
retrieving revision 1.7
diff -u -b -r1.7 wrap_blocks.m
--- compiler/wrap_blocks.m 19 Oct 2005 05:39:05 -0000 1.7
+++ compiler/wrap_blocks.m 27 Oct 2005 14:31:22 -0000
@@ -23,7 +23,7 @@
:- interface.
-:- import_module ll_backend__llds.
+:- import_module ll_backend.llds.
:- import_module list.
@@ -31,7 +31,7 @@
:- implementation.
-:- import_module ll_backend__opt_util.
+:- import_module ll_backend.opt_util.
:- import_module bool.
:- import_module int.
cvs diff: Diffing compiler/notes
Index: compiler/notes/compiler_design.html
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/notes/compiler_design.html,v
retrieving revision 1.106
diff -u -b -r1.106 compiler_design.html
--- compiler/notes/compiler_design.html 15 Sep 2005 07:38:45 -0000 1.106
+++ compiler/notes/compiler_design.html 27 Oct 2005 13:05:42 -0000
@@ -280,8 +280,9 @@
predicates for manipulating insts and modes, prog_type contains utility
predicates for manipulating types, prog_foreign contains utility
predicates for manipulating foreign code, prog_mutable contains utility
- predicates for manipulating mutable variables, while error_util.m contains
- predicates for printing nicely formatting error messages.
+ predicates for manipulating mutable variables,
+ while error_util.m contains predicates
+ for printing nicely formatting error messages.
<li><p> imports and exports are handled at this point (modules.m)
@@ -985,6 +986,9 @@
it cannot fail etc), it either deletes the goal or moves it to the
computation branches where its output is needed.
+<dt> lco.m finds predicates whose implementations would benefit
+ from last call optimization modulo constructor application.
+
<li> elimination of dead procedures (dead_proc_elim.m). Inlining, higher-order
specialization and the elimination of unused args can make procedures dead
even the user doesn't, and automatically constructed unification and
@@ -1639,6 +1643,7 @@
The following modules are part of the libs.m package.
<dl>
+
<dt> process_util.m:
<dd>
Predicates to deal with process creation and signal handling.
@@ -1665,6 +1670,21 @@
Implements the linear programming algorithm for optimizing
a set of linear constraints with respect to a linear
cost function. This is used by termination analyser.
+
+ <dt> lp_rational.m
+ <dd>
+ Implements the linear programming algorithm for optimizing
+ a set of linear constraints with respect to a linear
+ cost function, for rational numbers.
+ This is used by termination analyser.
+
+ <dt> rat.m
+ <dd>
+ Implements rational numbers.
+
+ <dt> compiler_util.m:
+ <dd>
+ Generic utility predicates, mainly for error handling.
</dl>
<hr>
@@ -1686,13 +1706,6 @@
Approximate topological sort.
This was once used for traversing the call graph,
but nowadays we use relation__atsort from library/relation.m.
-
- <dt> lco.m (in the transform_hlds.m package):
- <dd>
- This finds predicates whose implementations would benefit
- from last call optimization modulo constructor application.
- It does not apply the optimization and will not until the
- mode system is capable of expressing definite aliasing.
</dl>
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.182
diff -u -b -r1.182 Mmakefile
--- tests/invalid/Mmakefile 20 Oct 2005 07:42:31 -0000 1.182
+++ tests/invalid/Mmakefile 27 Oct 2005 15:04:57 -0000
@@ -69,6 +69,7 @@
cyclic_typeclass_2 \
cyclic_typeclass_3 \
det_errors \
+ det_errors_cc \
duplicate_modes \
duplicate_module_test \
erroneous_throw_promise \
Index: tests/invalid/det_errors.err_exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/invalid/det_errors.err_exp,v
retrieving revision 1.3
diff -u -b -r1.3 det_errors.err_exp
Index: tests/invalid/det_errors_cc.err_exp
===================================================================
RCS file: tests/invalid/det_errors_cc.err_exp
diff -N tests/invalid/det_errors_cc.err_exp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/invalid/det_errors_cc.err_exp 27 Oct 2005 15:05:22 -0000
@@ -0,0 +1,57 @@
+det_errors_cc.m:055: Error: call to predicate `p1/2' with determinism
+det_errors_cc.m:055: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:055: solutions.
+det_errors_cc.m:066: Switch on C is incomplete.
+det_errors_cc.m:048: Error: call to predicate `p3/2' with determinism
+det_errors_cc.m:048: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:048: solutions.
+det_errors_cc.m:050: Higher-order predicate call can fail.
+det_errors_cc.m:042: Error: call to predicate `p2/2' with determinism
+det_errors_cc.m:042: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:042: solutions.
+det_errors_cc.m:043: Negated goal can fail.
+det_errors_cc.m:032: Error: call to predicate `p3/2' with determinism
+det_errors_cc.m:032: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:032: solutions.
+det_errors_cc.m:034: Fail goal can fail.
+det_errors_cc.m:023: Error: call to predicate `p3/2' with determinism
+det_errors_cc.m:023: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:023: solutions.
+det_errors_cc.m:024: Call to p4 can fail.
+det_errors_cc.m:025: Unification of C with 10 can fail.
+det_errors_cc.m:026: Unification of B and C can fail.
+det_errors_cc.m:024: Error: call to predicate `p4/2' with determinism
+det_errors_cc.m:024: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:024: solutions.
+det_errors_cc.m:025: Unification of C with 10 can fail.
+det_errors_cc.m:026: Unification of B and C can fail.
+det_errors_cc.m:013: Error: call to predicate `p1/2' with determinism
+det_errors_cc.m:013: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:013: solutions.
+det_errors_cc.m:014: Call to p2 can fail.
+det_errors_cc.m:015: Call to p3 can fail.
+det_errors_cc.m:016: Call to p4 can fail.
+det_errors_cc.m:017: Call to p5 can fail.
+det_errors_cc.m:018: Call to p6 can fail.
+det_errors_cc.m:014: Error: call to predicate `p2/2' with determinism
+det_errors_cc.m:014: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:014: solutions.
+det_errors_cc.m:015: Call to p3 can fail.
+det_errors_cc.m:016: Call to p4 can fail.
+det_errors_cc.m:017: Call to p5 can fail.
+det_errors_cc.m:018: Call to p6 can fail.
+det_errors_cc.m:015: Error: call to predicate `p3/2' with determinism
+det_errors_cc.m:015: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:015: solutions.
+det_errors_cc.m:016: Call to p4 can fail.
+det_errors_cc.m:017: Call to p5 can fail.
+det_errors_cc.m:018: Call to p6 can fail.
+det_errors_cc.m:016: Error: call to predicate `p4/2' with determinism
+det_errors_cc.m:016: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:016: solutions.
+det_errors_cc.m:017: Call to p5 can fail.
+det_errors_cc.m:018: Call to p6 can fail.
+det_errors_cc.m:017: Error: call to predicate `p5/2' with determinism
+det_errors_cc.m:017: `cc_nondet' occurs in a context which requires all
+det_errors_cc.m:017: solutions.
+det_errors_cc.m:018: Call to p6 can fail.
Index: tests/invalid/det_errors_deep.err_exp
===================================================================
RCS file: tests/invalid/det_errors_deep.err_exp
diff -N tests/invalid/det_errors_deep.err_exp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/invalid/det_errors_deep.err_exp 28 Oct 2005 01:59:04 -0000
@@ -0,0 +1,31 @@
+det_errors_deep.m:010: In `p1(in, in, out)':
+det_errors_deep.m:010: error: determinism declaration not satisfied.
+det_errors_deep.m:010: Declared `det', inferred `semidet'.
+det_errors_deep.m:019: In argument 2 of clause head:
+det_errors_deep.m:019: unification of `HeadVar__2' and `X' can fail.
+det_errors_deep.m:011: In `p2(in, in, out)':
+det_errors_deep.m:011: error: determinism declaration not satisfied.
+det_errors_deep.m:011: Declared `det', inferred `semidet'.
+det_errors_deep.m:022: In argument 2 of clause head:
+det_errors_deep.m:022: in argument 2 of functor `node/3':
+det_errors_deep.m:022: unification with `X' can fail.
+det_errors_deep.m:012: In `p3(in, in, out)':
+det_errors_deep.m:012: error: determinism declaration not satisfied.
+det_errors_deep.m:012: Declared `det', inferred `semidet'.
+det_errors_deep.m:024: In argument 2 of clause head:
+det_errors_deep.m:024: unification of `HeadVar__2' and
+det_errors_deep.m:024: `det_errors_deep.node(_L, V_8, _R)' can fail.
+det_errors_deep.m:024: In argument 2 of clause head:
+det_errors_deep.m:024: in argument 2 of functor `node/3':
+det_errors_deep.m:024: unification with `X' can fail.
+det_errors_deep.m:013: In `p4(in, in, out)':
+det_errors_deep.m:013: error: determinism declaration not satisfied.
+det_errors_deep.m:013: Declared `det', inferred `semidet'.
+det_errors_deep.m:027: In argument 2 of clause head:
+det_errors_deep.m:027: unification of `HeadVar__2' and `X' can fail.
+det_errors_deep.m:028: In argument 1 of clause head:
+det_errors_deep.m:028: in argument 3 of functor `node/3':
+det_errors_deep.m:028: in argument 2 of functor `node/3':
+det_errors_deep.m:028: unification with `X' can fail.
+det_errors_deep.m:028: In argument 2 of clause head:
+det_errors_deep.m:028: unification of `HeadVar__2' and `X' can fail.
Index: tests/invalid/det_errors_deep.m
===================================================================
RCS file: tests/invalid/det_errors_deep.m
diff -N tests/invalid/det_errors_deep.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/invalid/det_errors_deep.m 28 Oct 2005 01:58:26 -0000
@@ -0,0 +1,28 @@
+:- module det_errors_deep.
+
+:- interface.
+
+:- import_module std_util.
+
+:- type t ---> a ; b ; c ; d.
+:- type tree ---> leaf ; node(tree, pair(t, int), tree).
+
+:- pred p1(tree::in, t::in, int::out) is det.
+:- pred p2(t::in, tree::in, int::out) is det.
+:- pred p3(t::in, tree::in, int::out) is det.
+:- pred p4(tree::in, t::in, int::out) is det.
+
+:- implementation.
+:- import_module int.
+
+p1(leaf, _, 1).
+p1(node(_L, X - Y, _R), X, Y).
+
+p2(_, leaf, 1).
+p2(X, node(_L, X - Y, _R), Y).
+
+p3(X, node(_L, X - Y, _R), Y).
+
+p4(leaf, _, 1).
+p4(node(_L, X - Y, leaf), X, Y).
+p4(node(_L, X - Y, node(_RL, X - _, _RR)), X, Y).
Index: tests/invalid/magicbox.err_exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/invalid/magicbox.err_exp,v
retrieving revision 1.4
diff -u -b -r1.4 magicbox.err_exp
--- tests/invalid/magicbox.err_exp 14 Sep 2005 05:26:47 -0000 1.4
+++ tests/invalid/magicbox.err_exp 27 Oct 2005 16:25:24 -0000
@@ -1,5 +1,5 @@
magicbox.m:036: In `arguments_handler(di, uo, out)':
magicbox.m:036: error: determinism declaration not satisfied.
magicbox.m:036: Declared `cc_multi', inferred `cc_nondet'.
-magicbox.m:055: call to `to_int(in, out)' can fail.
-magicbox.m:062: call to `to_int(in, out)' can fail.
+magicbox.m:055: call to `string.to_int(in, out)' can fail.
+magicbox.m:062: call to `string.to_int(in, out)' can fail.
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list