[m-dev.] diff: clean up some dead code in modules.m

[Fergus Henderson]

I made this change as I was beginning my change for abstract
equivalence types, but I thought it best to treat this as a separate
change, to make things easier to review.

----------

Estimated hours taken: 1

compiler/modules.m:
	Delete the boolean second argument to `get_interface',
	since it wasn't being used; all callers were passing `no'.
	Also add a sanity check.

Workspace: /home/venus/fjh/ws-venus2/mercury
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.150
diff -u -d -r1.150 modules.m
--- compiler/modules.m	2001/02/09 14:01:03	1.150
+++ compiler/modules.m	2001/02/12 11:35:32
@@ -849,7 +849,7 @@
 	% and use these to qualify all items in the interface as much as
 	% possible. Then write out the .int and .int2 files.
 make_interface(SourceFileName, ModuleName, Items0) -->
-	{ get_interface(Items0, no, InterfaceItems0) },
+	{ get_interface(Items0, InterfaceItems0) },
 		% 
 		% Get the .int3 files for imported modules
 		%
@@ -906,7 +906,7 @@
 	% This qualifies everything as much as it can given the
 	% information in the current module and writes out the .int3 file.
 make_short_interface(ModuleName, Items0) -->
-	{ get_interface(Items0, no, InterfaceItems0) },
+	{ get_interface(Items0, InterfaceItems0) },
 		% assertions are also stripped since they should
 		% only be written to .opt files,
 	{ strip_assertions(InterfaceItems0, InterfaceItems1) },
@@ -1062,7 +1062,7 @@
 	( { ExportWarning = no } ->
 		[]
 	;
-		{ get_interface(Items, no, InterfaceItems) },
+		{ get_interface(Items, InterfaceItems) },
 		check_int_for_no_exports(InterfaceItems, ModuleName)
 	).
 
@@ -1218,7 +1218,7 @@
 			ImpUsedModules0, ImpUsedModules),
 
 	{ get_fact_table_dependencies(Items0, FactDeps) },
-	{ get_interface(Items0, no, InterfaceItems) },
+	{ get_interface(Items0, InterfaceItems) },
 	{ get_children(InterfaceItems, PublicChildren) },
 	{ init_module_imports(SourceFileName, ModuleName, Items0,
 		PublicChildren, FactDeps, Module0) },
@@ -3482,7 +3482,7 @@
 		ImplImportDeps, ImplUseDeps),
 	list__append(ImplImportDeps, ImplUseDeps, ImplementationDeps),
 
-	get_interface(Items, no, InterfaceItems),
+	get_interface(Items, InterfaceItems),
 	get_dependencies(InterfaceItems, InterfaceImportDeps0,
 		InterfaceUseDeps0),
 	add_implicit_imports(InterfaceItems, Globals,
@@ -4315,24 +4315,22 @@
 
 	% Given a module (well, a list of items), extract the interface
 	% part of that module, i.e. all the items between `:- interface'
-	% and `:- implementation'. If IncludeImported is yes, also
-	% include all items after a `:- imported'. This is useful for
-	% making the .int file.
+	% and `:- implementation'.
 	% The bodies of instance definitions are removed because
 	% the instance methods have not yet been module qualified.
-:- pred get_interface(item_list, bool, item_list).
-:- mode get_interface(in, in, out) is det.
+:- pred get_interface(item_list, item_list).
+:- mode get_interface(in, out) is det.
 
-get_interface(Items0, IncludeImported, Items) :-
-	get_interface_2(Items0, no, IncludeImported, [], RevItems),
+get_interface(Items0, Items) :-
+	get_interface_2(Items0, no, [], RevItems),
 	list__reverse(RevItems, Items).
 
-:- pred get_interface_2(item_list, bool, bool, item_list, item_list).
-:- mode get_interface_2(in, in, in, in, out) is det.
+:- pred get_interface_2(item_list, bool, item_list, item_list).
+:- mode get_interface_2(in, in, in, out) is det.
 
-get_interface_2([], _, _, Items, Items).
+get_interface_2([], _, Items, Items).
 get_interface_2([Item - Context | Rest], InInterface0,
-				IncludeImported, Items0, Items) :-
+				Items0, Items) :-
 	( Item = module_defn(_, interface) ->
 		Items1 = Items0,
 		InInterface1 = yes
@@ -4342,13 +4340,12 @@
 		; Defn = used(_)
 		)
 	->
-		% module_qual.m needs the :- imported declaration.
-		( IncludeImported = yes, InInterface0 = yes ->
-			Items1 = [Item - Context | Items0]
-		;
-			Items1 = Items0
-		),
-		InInterface1 = InInterface0
+		% This should never happen;
+		% `:- imported' and `:- used' declarations should only
+		% get inserted *after* get_interface is called.
+		error("get_interface: `:- imported' or `:- used' declaration")
+		% Items1 = Items0,
+		% InInterface1 = InInterface0
 	;
 		Item = module_defn(_, implementation) 
 	->
@@ -4367,7 +4364,7 @@
 		),
 		InInterface1 = InInterface0
 	),
-	get_interface_2(Rest, InInterface1, IncludeImported, Items1, Items).
+	get_interface_2(Rest, InInterface1, Items1, Items).
 
 	% Given a module interface (well, a list of items), extract the
 	% short interface part of that module, i.e. the exported

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------