[m-rev.] for review: reduce size of interface files

[Simon Taylor]

Estimated hours taken: 1

Reduce the size of the generated interface files by not printing
unnecessary module qualifiers. This change reduces the total size
of {compiler,library}/{*.int,*.int2,*.int3} (with smart recompilation)
by about 10%.

compiler/mercury_to_mercury.m:
	Don't qualify declarations where the qualifier is implied
	by a previous `:- module' declaration.

	Never output module qualifiers on constructors or class methods.
	The qualifier is implied by the qualifier on the type or typeclass
	declaration.

	Put the `.' at the end of a discriminated union definition
	on a separate line. This avoids problems with types like
	`:- type t --> += .'.

tests/misc_tests/pretty_print_test.exp:
	Update expected output.

Index: compiler/mercury_to_mercury.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mercury_to_mercury.m,v
retrieving revision 1.201
diff -u -u -r1.201 mercury_to_mercury.m
--- compiler/mercury_to_mercury.m	16 Jan 2002 01:13:29 -0000	1.201
+++ compiler/mercury_to_mercury.m	24 Jan 2002 16:11:58 -0000
@@ -136,6 +136,12 @@
 :- func mercury_pragma_decl_to_string(sym_name, int, pred_or_func, string)
 	= string.
 
+:- pred mercury_output_foreign_language_string(foreign_language,
+		io__state, io__state).
+:- mode mercury_output_foreign_language_string(in, di, uo) is det.
+
+:- func mercury_foreign_language_to_string(foreign_language) = string.
+
 :- pred mercury_output_pragma_foreign_code(
 		pragma_foreign_proc_attributes, sym_name,
 		pred_or_func, list(pragma_var), prog_varset,
@@ -345,7 +351,11 @@
 		io__write_string(":- module "),
 		mercury_output_bracketed_sym_name(ModuleName),
 		io__write_string(".\n"),
-		mercury_output_item_list(Items),
+
+		% Module qualifiers on items are redundant after the
+		% declaration above.
+		{ UnqualifiedItemNames = yes },
+		mercury_output_item_list(UnqualifiedItemNames, Items),
 		( { Verbose = yes } ->
 			io__write_string(StdErr, " done\n")
 		;
@@ -362,38 +372,53 @@
 
 	% output the declarations one by one 
 
-:- pred mercury_output_item_list(list(item_and_context), io__state, io__state).
-:- mode mercury_output_item_list(in, di, uo) is det.
+:- pred mercury_output_item_list(bool, list(item_and_context),
+		io__state, io__state).
+:- mode mercury_output_item_list(in, in, di, uo) is det.
 
-mercury_output_item_list([]) --> [].
-mercury_output_item_list([Item - Context | Items]) -->
-	mercury_output_item(Item, Context),
-	mercury_output_item_list(Items).
+mercury_output_item_list(_, []) --> [].
+mercury_output_item_list(UnqualifiedItemNames, [Item - Context | Items]) -->
+	mercury_output_item(UnqualifiedItemNames, Item, Context),
+	mercury_output_item_list(UnqualifiedItemNames, Items).
 
 %-----------------------------------------------------------------------------%
 
+mercury_output_item(Item, Context) -->
+	{ UnqualifiedItemNames = no },
+	mercury_output_item(UnqualifiedItemNames, Item, Context).
+
+:- pred mercury_output_item(bool, item, prog_context, io__state, io__state).
+:- mode mercury_output_item(in, in, in, di, uo) is det.
+
 	% dispatch on the different types of items
 
-mercury_output_item(type_defn(VarSet, Name, Args, TypeDefn, _Cond),
+mercury_output_item(UnqualifiedItemNames,
+		type_defn(VarSet, Name0, Args, TypeDefn, _Cond),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, Name0, Name) },
 	maybe_output_line_number(Context),
 	mercury_output_type_defn(VarSet, Name, Args, TypeDefn, Context).
 
-mercury_output_item(inst_defn(VarSet, Name, Args, InstDefn, _Cond),
+mercury_output_item(UnqualifiedItemNames,
+		inst_defn(VarSet, Name0, Args, InstDefn, _Cond),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, Name0, Name) },
 	maybe_output_line_number(Context),
 	mercury_output_inst_defn(VarSet, Name, Args, InstDefn, Context).
 
-mercury_output_item(mode_defn(VarSet, Name, Args, ModeDefn, _Cond),
+mercury_output_item(UnqualifiedItemNames,
+		mode_defn(VarSet, Name0, Args, ModeDefn, _Cond),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, Name0, Name) },
 	maybe_output_line_number(Context),
 	mercury_format_mode_defn(VarSet, Name, Args, ModeDefn, Context).
 
-mercury_output_item(
+mercury_output_item(UnqualifiedItemNames,
 		pred_or_func(TypeVarSet, InstVarSet, ExistQVars,
-			PredOrFunc, PredName, TypesAndModes, Det,
+			PredOrFunc, PredName0, TypesAndModes, Det,
 			_Cond, Purity, ClassContext),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, PredName0, PredName) },
 	maybe_output_line_number(Context),
 	(
 		{ PredOrFunc = predicate },
@@ -411,10 +436,11 @@
 			":- ", ".\n", ".\n")
 	).
 
-mercury_output_item(
-		pred_or_func_mode(VarSet, PredOrFunc, PredName,
+mercury_output_item(UnqualifiedItemNames,
+		pred_or_func_mode(VarSet, PredOrFunc, PredName0,
 			Modes, MaybeDet, _Cond),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, PredName0, PredName) },
 	maybe_output_line_number(Context),
 	(
 		{ PredOrFunc = predicate },
@@ -427,12 +453,14 @@
 			FuncModes, RetMode, MaybeDet, Context)
 	).
 
-mercury_output_item(module_defn(VarSet, ModuleDefn), Context) -->
+mercury_output_item(_, module_defn(VarSet, ModuleDefn), Context) -->
 	maybe_output_line_number(Context),
 	mercury_output_module_defn(VarSet, ModuleDefn, Context).
 
-mercury_output_item(clause(VarSet, PredOrFunc, PredName, Args, Body),
+mercury_output_item(UnqualifiedItemNames,
+		clause(VarSet, PredOrFunc, PredName0, Args, Body),
 		Context) -->
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames, PredName0, PredName) },
 	maybe_output_line_number(Context),
 	(
 		{ PredOrFunc = predicate },
@@ -446,7 +474,7 @@
 	),
 	io__write_string(".\n").
 
-mercury_output_item(pragma(Pragma), Context) -->
+mercury_output_item(_UnqualifiedItemNames, pragma(Pragma), Context) -->
 	maybe_output_line_number(Context),
 	(
 		{ Pragma = source_file(SourceFile) },
@@ -585,16 +613,19 @@
 			"check_termination")
 	).
 
-mercury_output_item(assertion(Goal, VarSet), _) -->
+mercury_output_item(_, assertion(Goal, VarSet), _) -->
 	io__write_string(":- promise "),
 	{ Indent = 1 },
 	mercury_output_newline(Indent),
 	mercury_output_goal(Goal, VarSet, Indent),
 	io__write_string(".\n").
 
-mercury_output_item(nothing(_), _) --> [].
-mercury_output_item(typeclass(Constraints, ClassName, Vars, Interface, VarSet),
+mercury_output_item(_, nothing(_), _) --> [].
+mercury_output_item(UnqualifiedItemNames,
+		typeclass(Constraints, ClassName0, Vars, Interface, VarSet),
 		_) --> 
+	{ maybe_unqualify_sym_name(UnqualifiedItemNames,
+		ClassName0, ClassName) },
 	io__write_string(":- typeclass "),
 
 		% We put an extra set of brackets around the class name in
@@ -624,7 +655,7 @@
 		output_class_methods(Methods),
 		io__write_string("\n].\n")
 	).
-mercury_output_item(instance(Constraints, ClassName, Types, Body, 
+mercury_output_item(_, instance(Constraints, ClassName, Types, Body, 
 		VarSet, _InstanceModuleName), _) --> 
 	io__write_string(":- instance "),
 
@@ -666,34 +697,45 @@
 	io__write_string("\t"),
 	(
 		{ Method = pred_or_func(TypeVarSet, InstVarSet, ExistQVars,
-			PredOrFunc, Name, TypesAndModes, Detism, _Condition,
+			PredOrFunc, Name0, TypesAndModes, Detism, _Condition,
 			Purity, ClassContext, Context) },
+
+		% The module name is implied by the qualifier of the
+		% `:- typeclass declaration'.
+		{ unqualify_name(Name0, Name) },
 		(
 			{ PredOrFunc = predicate },
 			mercury_format_pred_decl(TypeVarSet, InstVarSet,
-				ExistQVars, Name, TypesAndModes, Detism,
-				Purity, ClassContext, Context, "", ",\n\t", "")
+				ExistQVars, unqualified(Name), TypesAndModes,
+				Detism, Purity, ClassContext, Context,
+				"", ",\n\t", "")
 		;
 			{ PredOrFunc = function },
 			{ pred_args_to_func_args(TypesAndModes,
 				FuncTypesAndModes, RetTypeAndMode) },
 			mercury_format_func_decl(TypeVarSet, InstVarSet,
-				ExistQVars, Name, FuncTypesAndModes,
-				RetTypeAndMode, Detism, Purity, ClassContext,
-				Context, "", ",\n\t", "")
+				ExistQVars, unqualified(Name),
+				FuncTypesAndModes, RetTypeAndMode, Detism,
+				Purity, ClassContext, Context, "", ",\n\t", "")
 		)
 	;
 		{ Method = pred_or_func_mode(VarSet, PredOrFunc,
-			Name, Modes, Detism, _Condition, Context) },
+			Name0, Modes, Detism, _Condition, Context) },
+
+		% The module name is implied by the qualifier of the
+		% `:- typeclass declaration'.
+		{ unqualify_name(Name0, Name) },
 		(
 			{ PredOrFunc = predicate },
-			mercury_format_pred_mode_decl_2(VarSet, Name, Modes,
+			mercury_format_pred_mode_decl_2(VarSet,
+				unqualified(Name), Modes,
 				Detism, Context, "", "")
 		;
 			{ PredOrFunc = function },
 			{ pred_args_to_func_args(Modes, FuncModes, RetMode) },
-			mercury_format_func_mode_decl_2(VarSet, Name,
-				FuncModes, RetMode, Detism, Context, "", "")
+			mercury_format_func_mode_decl_2(VarSet,
+				unqualified(Name), FuncModes, RetMode,
+				Detism, Context, "", "")
 		)
 	).
 
@@ -1513,7 +1555,7 @@
 	;
 		[]
 	),
-	io__write_string(".\n").
+	io__write_string("\n\t.\n").
 
 :- pred mercury_output_ctors(list(constructor), tvarset,
 				io__state, io__state).
@@ -1530,7 +1572,11 @@
 	mercury_output_ctors(Ctors, VarSet).
 
 mercury_output_ctor(Ctor, VarSet) -->
-	{ Ctor = ctor(ExistQVars, Constraints, Name, Args) },
+	{ Ctor = ctor(ExistQVars, Constraints, SymName, Args) },
+
+	% We'll have attached the module name to the type definition,
+	% so there's no point adding it to the constructor as well.
+	{ unqualify_name(SymName, Name) },
 
 	{ AppendVarnums = no },
 	mercury_output_quantifier(VarSet, AppendVarnums, ExistQVars),
@@ -1547,10 +1593,10 @@
 	{ list__length(Args, Arity) },
 	(
 		{ Arity = 2 },
-		{ Name = unqualified(";")
-		; Name = unqualified("{}")
-		; Name = unqualified("some")
-		; Name = unqualified("=>")
+		{ Name = ";"
+		; Name = "{}"
+		; Name = "some"
+		; Name = "=>"
 		}
 	->
 		io__write_string("{ ")
@@ -1560,20 +1606,20 @@
 	(
 		{ Args = [Arg | Rest] }
 	->
-		mercury_output_sym_name(Name),
+		mercury_output_sym_name(unqualified(Name)),
 		io__write_string("("),
 		mercury_output_ctor_arg(VarSet, Arg),
 		mercury_output_remaining_ctor_args(VarSet, Rest),
 		io__write_string(")")
 	;
-		mercury_output_bracketed_sym_name(Name)
+		mercury_output_bracketed_sym_name(unqualified(Name))
 	),
 	(
 		{ Arity = 2 },
-		{ Name = unqualified(";")
-		; Name = unqualified("{}")
-		; Name = unqualified("some")
-		; Name = unqualified("=>")
+		{ Name = ";"
+		; Name = "{}"
+		; Name = "some"
+		; Name = "=>"
 		}
 	->
 		io__write_string(" }")
@@ -2397,6 +2443,12 @@
 	mercury_format_foreign_code_string(ForeignDeclString),
 	add_string(").\n").
 
+mercury_output_foreign_language_string(Lang) -->
+	mercury_format_foreign_language_string(Lang).
+
+mercury_foreign_language_to_string(Lang) = String :- 
+	mercury_format_foreign_language_string(Lang, "", String).
+
 :- pred mercury_format_foreign_language_string(foreign_language::in,
 	U::di, U::uo) is det <= output(U).
 
@@ -3394,6 +3446,15 @@
 	;
 		[]
 	).
+
+%-----------------------------------------------------------------------------%
+
+:- pred maybe_unqualify_sym_name(bool, sym_name, sym_name).
+:- mode maybe_unqualify_sym_name(in, in, out) is det.
+
+maybe_unqualify_sym_name(no, Name, Name).
+maybe_unqualify_sym_name(yes, Name0, unqualified(Name)) :-
+	unqualify_name(Name0, Name).
 
 %-----------------------------------------------------------------------------%
 
Index: tests/misc_tests/pretty_print_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/misc_tests/pretty_print_test.exp,v
retrieving revision 1.3
diff -u -u -r1.3 pretty_print_test.exp
--- tests/misc_tests/pretty_print_test.exp	20 May 1998 13:10:19 -0000	1.3
+++ tests/misc_tests/pretty_print_test.exp	24 Jan 2002 15:55:20 -0000
@@ -1,28 +1,30 @@
 :- module pretty_print_test.
 :- interface.
 :- import_module io.
-:- pred pretty_print_test:main(io__state, io__state).
-:- mode pretty_print_test:main(di, uo) is det.
+:- pred main(io__state, io__state).
+:- mode main(di, uo) is det.
 :- implementation.
-:- type (pretty_print_test:foobar)
-	--->	(pretty_print_test:foo)
-	;	pretty_print_test:bar(int)
-	;	pretty_print_test:baz(int, int).
-:- type (pretty_print_test:cont(T))
-	--->	(pretty_print_test:foo)
-	;	pretty_print_test:cont(T, cont(T)).
-:- type (pretty_print_test:eq(T1, T2)) == foobar.
-pretty_print_test:main(DCG_0, DCG_2) :-
+:- type foobar
+	--->	foo
+	;	bar(int)
+	;	baz(int, int)
+	.
+:- type cont(T)
+	--->	foo
+	;	cont(T, cont(T))
+	.
+:- type eq(T1, T2) == foobar.
+main(DCG_0, DCG_2) :-
 	io:write_int(type_num(42), DCG_0, DCG_1),
 	io:nl(DCG_1, DCG_2).
-:- typeclass pretty_print_test:numbered_type(T) where [
-	func pretty_print_test:type_num(T) = int,
-	func pretty_print_test:type_num_2(T) = int,
-	pred pretty_print_test:type_num_3(T, int),
-	mode pretty_print_test:type_num_3(in, out),
-	mode pretty_print_test:type_num_3(out, in),
-	pred pretty_print_test:type_num_4(T, int),
-	mode pretty_print_test:type_num_4(in, out)
+:- typeclass numbered_type(T) where [
+	func type_num(T) = int,
+	func type_num_2(T) = int,
+	pred type_num_3(T, int),
+	mode type_num_3(in, out),
+	mode type_num_3(out, in),
+	pred type_num_4(T, int),
+	mode type_num_4(in, out)
 ].
 :- instance (numbered_type(int)) where [
 	func(type_num/1) is foo_type_num,
@@ -30,9 +32,9 @@
 	pred(type_num_3/2) is foo_type_num_p,
 	pred(type_num_4/2) is foo_type_num_p
 ].
-:- func pretty_print_test:foo_type_num(int) = int.
-pretty_print_test:foo_type_num(V_1) = 42.
-:- pred pretty_print_test:foo_type_num_p(int, int).
-:- mode pretty_print_test:foo_type_num_p(in, out) is det.
-:- mode pretty_print_test:foo_type_num_p(out, in) is det.
-pretty_print_test:foo_type_num_p(V_1, 42).
+:- func foo_type_num(int) = int.
+foo_type_num(V_1) = 42.
+:- pred foo_type_num_p(int, int).
+:- mode foo_type_num_p(in, out) is det.
+:- mode foo_type_num_p(out, in) is det.
+foo_type_num_p(V_1, 42).
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------