[m-rev.] diff: fix INCLUDE_ADITI_OUTPUT

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

compiler/Mmakefile:
compiler/aditi_backend.pp:
	rl_exprn.m and rl_code.m should only be compiled and included
	in mercury_compile if INCLUDE_ADITI_OUTPUT is set to `yes'.

compiler/aditi_backend.m:
	Removed.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.58
diff -u -u -r1.58 Mmakefile
--- Mmakefile	22 Jun 2002 19:15:54 -0000	1.58
+++ Mmakefile	26 Jul 2002 08:22:42 -0000
@@ -85,6 +85,7 @@
 # Define $(PP_SED_EXPR) appropriately for each preprocessed module.
 #
 PP_SED_EXPR			= $(PP_SED_EXPR-$*)
+PP_SED_EXPR-aditi_backend	= $(ADITI_SED_EXPR)
 PP_SED_EXPR-rl_file 		= $(ADITI_SED_EXPR)
 PP_SED_EXPR-rl_out		= $(ADITI_SED_EXPR)
 PP_SED_EXPR-maybe_mlds_to_gcc	= $(GCC_SED_EXPR)
@@ -119,7 +120,7 @@
 		-e "/^$${hash}endif/s/.*//"
 endif
 
-PREPROCESSED_MODULES = rl_file rl_out maybe_mlds_to_gcc
+PREPROCESSED_MODULES = aditi_backend rl_file rl_out maybe_mlds_to_gcc
 PREPROCESSED_FILES = $(PREPROCESSED_MODULES:%=%.pp)
 PREPROCESSED_M_FILES = $(PREPROCESSED_MODULES:%=%.m)
 PP_DATE_FILES = $(PREPROCESSED_MODULES:%=$(dates_subdir)%.pp_date)
Index: aditi_backend.m
===================================================================
RCS file: aditi_backend.m
diff -N aditi_backend.m
--- aditi_backend.m	20 Mar 2002 12:35:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-%-----------------------------------------------------------------------------%
-% Copyright (C) 2002 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.
-%-----------------------------------------------------------------------------%
-%
-% The Aditi back-end
-%
-:- module aditi_backend.
-:- interface.
-:- import_module transform_hlds, check_hlds. % are these needed?
-:- import_module hlds, parse_tree, libs.
-
-%:- import_module aditi_hlds, aditi_codegen, aditi_rl_out.
-
-%
-% Phase 4-rl: Aditi-related HLDS transformations
-%
-%:- module aditi_hlds.
-%   :- interface.
-   :- include_module dnf.
-   :- include_module magic, magic_util.
-   :- include_module context.
-%:- end_module aditi_hlds.
-
-%
-% The Aditi-RL type itself.
-%
-:- include_module rl.
-:- include_module rl_dump.
-
-%
-% Phase 5-rl: The Aditi RL code generator
-%
-%:- module aditi_codegen.
-%   :- interface.
-   :- include_module rl_gen.
-   :- include_module rl_info.
-   :- include_module rl_relops.
-%:- end_module aditi_codegen.
-
-%
-% Phase 6-rl: Low-level (RL -> RL) optimizations
-%
-:- include_module rl_opt.
-   :- include_module rl_block, rl_analyse, rl_liveness, rl_loop, rl_block_opt.
-   :- include_module rl_key, rl_sort, rl_stream.
-
-%
-% Phase 7-rl: Emit RL bytecodes.
-%
-%:- module aditi_rl_out.
-   :- include_module rl_out, rl_exprn, rl_code, rl_file.
-%:- end_module aditi_rl_out.
-       
-%-----------------------------------------------------------------------------%
-
-:- implementation.
-	% aditi_backend__rl_exprn uses ll_backend__llds
-	% and backend_libs__builtin_ops.
-:- import_module ll_backend.
-:- import_module backend_libs.
-
-:- end_module aditi_backend.
-
-%-----------------------------------------------------------------------------%
Index: aditi_backend.pp
===================================================================
RCS file: aditi_backend.pp
diff -N aditi_backend.pp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aditi_backend.pp	26 Jul 2002 08:48:21 -0000
@@ -0,0 +1,72 @@
+%-----------------------------------------------------------------------------%
+% Copyright (C) 2002 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.
+%-----------------------------------------------------------------------------%
+%
+% The Aditi back-end
+%
+:- module aditi_backend.
+:- interface.
+:- import_module transform_hlds, check_hlds. % are these needed?
+:- import_module hlds, parse_tree, libs.
+
+%:- import_module aditi_hlds, aditi_codegen, aditi_rl_out.
+
+%
+% Phase 4-rl: Aditi-related HLDS transformations
+%
+%:- module aditi_hlds.
+%   :- interface.
+   :- include_module dnf.
+   :- include_module magic, magic_util.
+   :- include_module context.
+%:- end_module aditi_hlds.
+
+%
+% The Aditi-RL type itself.
+%
+:- include_module rl.
+:- include_module rl_dump.
+
+%
+% Phase 5-rl: The Aditi RL code generator
+%
+%:- module aditi_codegen.
+%   :- interface.
+   :- include_module rl_gen.
+   :- include_module rl_info.
+   :- include_module rl_relops.
+%:- end_module aditi_codegen.
+
+%
+% Phase 6-rl: Low-level (RL -> RL) optimizations
+%
+:- include_module rl_opt.
+   :- include_module rl_block, rl_analyse, rl_liveness, rl_loop, rl_block_opt.
+   :- include_module rl_key, rl_sort, rl_stream.
+
+%
+% Phase 7-rl: Emit RL bytecodes.
+%
+%:- module aditi_rl_out.
+   :- include_module rl_out, rl_file. 
+
+#if INCLUDE_ADITI_OUTPUT
+   :- include_module rl_exprn, rl_code.
+#else
+#endif
+
+%:- end_module aditi_rl_out.
+       
+%-----------------------------------------------------------------------------%
+
+:- implementation.
+	% aditi_backend__rl_exprn uses ll_backend__llds
+	% and backend_libs__builtin_ops.
+:- import_module ll_backend.
+:- import_module backend_libs.
+
+:- end_module aditi_backend.
+
+%-----------------------------------------------------------------------------%
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------