[m-rev.] trivial diff: minor cleanups

[Fergus Henderson]

Estimated hours taken: 1
Branches: main

Various trivial minor cleanups.

compiler/hlds.m:
compiler/ll_backend.m:
	Delete obsolete XXX comments that referred to problems which
	have since been fixed.

compiler/ll_backend.m:
	Fix an XXX: list the HLDS->HLDS passes in the order in which
	they get invoked.

compiler/hlds_code_util.m:
	Delete a type whose only purpose was to avoid a warning about
	the interface of this module being empty, since the interface
	is no longer empty.

compiler/modules.m:
	s/  / /

compiler/post_typecheck.m:
	Delete an unnecessary `:- import_module' declaration.

Workspace: /home/ceres/fjh/mercury
Index: compiler/hlds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/hlds.m,v
retrieving revision 1.210
diff -u -d -r1.210 hlds.m
--- compiler/hlds.m	16 Mar 2003 08:01:27 -0000	1.210
+++ compiler/hlds.m	4 Jun 2003 09:01:15 -0000
@@ -44,7 +44,7 @@
 :- include_module error_util.
 :- include_module goal_form.
 :- include_module goal_util.
-:- include_module hlds_code_util.	% XXX currently code_util.m
+:- include_module hlds_code_util.
 :- include_module passes_aux.
 
 %-----------------------------------------------------------------------------%
Index: compiler/hlds_code_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/hlds_code_util.m,v
retrieving revision 1.4
diff -u -d -r1.4 hlds_code_util.m
--- compiler/hlds_code_util.m	15 Mar 2003 07:11:56 -0000	1.4
+++ compiler/hlds_code_util.m	4 Jun 2003 09:07:00 -0000
@@ -20,8 +20,6 @@
 :- import_module hlds__hlds_module.
 :- import_module parse_tree__prog_data.
 
-:- type hlds_code_util ---> suppress_warning_about_nothing_exported.
-
 	% Are equivalence types fully expanded on this backend?
 :- pred are_equivalence_types_expanded(module_info::in) is semidet.
 
Index: compiler/ll_backend.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ll_backend.m,v
retrieving revision 1.5
diff -u -d -r1.5 ll_backend.m
--- compiler/ll_backend.m	9 May 2003 05:51:50 -0000	1.5
+++ compiler/ll_backend.m	4 Jun 2003 10:30:33 -0000
@@ -21,21 +21,20 @@
 %-----------------------------------------------------------------------------%
 
 % Pre-passes to transform or annotate the HLDS
-% (XXX these are not listed in right order)
-:- include_module saved_vars.	% transform
-:- include_module stack_opt.	% transform
-:- include_module stack_alloc.	% annotate
-:- include_module arg_info.	% annotate
-:- include_module liveness.	% annotate
-:- include_module live_vars.	% annotate
-:- include_module follow_code.	% transform
-:- include_module follow_vars.	% annotate
-:- include_module store_alloc.	% annotate
-:- include_module deep_profiling. % transform
+:- include_module deep_profiling.	% transform
+:- include_module arg_info.		% annotate
+:- include_module saved_vars.		% transform
+:- include_module stack_opt.		% transform
+:- include_module follow_code.		% transform
+:- include_module liveness.		% annotate
+:- include_module stack_alloc.		% annotate
+   :- include_module live_vars.	  	% annotate
+   :- include_module follow_vars. 	% annotate
+:- include_module store_alloc.		% annotate
 
 % The llds data structure itself
 :- include_module llds.
-:- include_module code_util. % XXX
+:- include_module code_util.
 
 % The HLDS->LLDS code generator.
 :- include_module code_gen.
@@ -56,7 +55,7 @@
 
    :- include_module code_info.
    :- include_module exprn_aux.
-   :- include_module code_aux. % XXX
+   :- include_module code_aux.
    :- include_module continuation_info.
    :- include_module var_locn.
 
@@ -80,10 +79,10 @@
    :- include_module delay_slot.
    :- include_module labelopt.
    :- include_module peephole.
-   :- include_module reassign.
-   :- include_module wrap_blocks.
    :- include_module use_local_vars.
+   :- include_module wrap_blocks.
    :- include_module livemap.
+   :- include_module reassign.
    :- include_module basic_block.
    :- include_module opt_util.
    :- include_module opt_debug.
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.270
diff -u -d -r1.270 modules.m
--- compiler/modules.m	18 Mar 2003 02:43:40 -0000	1.270
+++ compiler/modules.m	26 Mar 2003 05:24:04 -0000
@@ -1195,7 +1195,7 @@
 		% `--c-include Mercury/<grade>/<fullarch>' to find
 		% the local `.opt' and `.mih' files without messing
 		% up the search for the files for installed libraries.
-		DirName =  "Mercury"/Grade/FullArch/"Mercury"/SubDirName
+		DirName = "Mercury"/Grade/FullArch/"Mercury"/SubDirName
 	;
 		DirName = "Mercury"/SubDirName
 	},
Index: compiler/post_typecheck.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/post_typecheck.m,v
retrieving revision 1.50
diff -u -d -r1.50 post_typecheck.m
--- compiler/post_typecheck.m	28 Mar 2003 06:55:12 -0000	1.50
+++ compiler/post_typecheck.m	4 Jun 2003 09:21:07 -0000
@@ -125,7 +125,6 @@
 
 :- implementation.
 
-:- import_module check_hlds__clause_to_proc.
 :- import_module check_hlds__inst_match.
 :- import_module check_hlds__mode_errors.
 :- import_module check_hlds__mode_util.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------