[m-rev.] diff: fix `mmc --make' sub-modules bug

[Simon Taylor]

Estimated hours taken: 0.5
Branches: main

compiler/make.module_dep_file.m:
	The `children' and `public_children' fields of
	the `module_imports' structure created by
	read_module_dependencies were reversed. Construct
	the `module_imports' structure using record syntax
	to avoid this problem in future.

Index: make.module_dep_file.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/make.module_dep_file.m,v
retrieving revision 1.3
diff -u -u -r1.3 make.module_dep_file.m
--- make.module_dep_file.m	7 Apr 2002 10:22:34 -0000	1.3
+++ make.module_dep_file.m	21 May 2002 19:02:52 -0000
@@ -384,12 +384,28 @@
 			ContainsForeignCode = contains_foreign_code(
 				set__list_to_set(ForeignLanguages))
 		},
-		{ Imports = module_imports(SourceFileName,
-			SourceFileModuleName, ModuleName, Parents,
-			IntDeps, ImplDeps, [], [], Children,
-			NestedChildren, FactDeps, ContainsForeignCode,
-			ForeignImports, ContainsForeignExport,
-			[], no_module_errors, no, HasMain, ModuleDir) },
+
+		% { Imports = module_imports(^...) },
+		{ Imports ^ source_file_name = SourceFileName },
+		{ Imports ^ source_file_module_name = SourceFileModuleName },
+		{ Imports ^ module_name = ModuleName },
+		{ Imports ^ parent_deps = Parents },
+		{ Imports ^ int_deps = IntDeps },
+		{ Imports ^ impl_deps = ImplDeps },
+		{ Imports ^ indirect_deps = [] },	% not used.
+		{ Imports ^ children = Children },
+		{ Imports ^ public_children = [] },	% not used.
+		{ Imports ^ nested_children = NestedChildren },
+		{ Imports ^ fact_table_deps = FactDeps },
+		{ Imports ^ foreign_code = ContainsForeignCode },
+		{ Imports ^ foreign_import_module_info = ForeignImports },
+		{ Imports ^ contains_foreign_export = ContainsForeignExport },
+		{ Imports ^ items = [] },		% not used.
+		{ Imports ^ error = no_module_errors },	% not used.
+		{ Imports ^ maybe_timestamps = no },	% not used.
+		{ Imports ^ has_main = HasMain },
+		{ Imports ^ module_dir = ModuleDir },
+
 		{ Info1 = Info0 ^ module_dependencies
 				^ elem(ModuleName) := yes(Imports) },
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------