[m-rev.] diff: hlds dump cleanup

[Zoltan Somogyi]

compiler/hlds_out.m:
	Clean up some clatter in HLDS dumps: don't dump the goal_info fields
	used by constraint based mode analysis unless they hold non-default
	information.

compiler/handle_options.m:
	Put dump aliases in logical order.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/handle_options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/handle_options.m,v
retrieving revision 1.213
diff -u -r1.213 handle_options.m
--- compiler/handle_options.m	5 Jan 2005 05:09:32 -0000	1.213
+++ compiler/handle_options.m	6 Jan 2005 01:49:27 -0000
@@ -1980,8 +1980,8 @@
 :- pred convert_dump_alias(string::in, string::out) is semidet.
 
 convert_dump_alias("ALL", "abcdfgilmnprstuvBCDIMPTU").
-convert_dump_alias("all", "abcdfgilmnprstuvBCMPT").
 convert_dump_alias("allD", "abcdfgilmnprstuvBCDMPT").
+convert_dump_alias("all", "abcdfgilmnprstuvBCMPT").
 convert_dump_alias("most", "bcdfgilmnprstuvP").
 convert_dump_alias("trans", "bcdglmnstuv").
 convert_dump_alias("codegen", "dfnprsu").
Index: compiler/hlds_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_out.m,v
retrieving revision 1.339
diff -u -r1.339 hlds_out.m
--- compiler/hlds_out.m	20 Dec 2004 01:15:38 -0000	1.339
+++ compiler/hlds_out.m	22 Dec 2004 07:12:40 -0000
@@ -1386,36 +1386,54 @@
 	),
 	( string__contains_char(Verbose, 'B') ->
 		ProducingVars = GoalInfo ^ producing_vars,
-		set__to_sorted_list(ProducingVars, ProducingVarsList),
-		hlds_out__write_indent(Indent, !IO),
-		io__write_string("% producing vars: ", !IO),
-		mercury_output_vars(ProducingVarsList, VarSet, AppendVarNums,
-			!IO),
-		io__write_string("\n", !IO),
+		( set__non_empty(ProducingVars) ->
+			set__to_sorted_list(ProducingVars, ProducingVarsList),
+			hlds_out__write_indent(Indent, !IO),
+			io__write_string("% producing vars: ", !IO),
+			mercury_output_vars(ProducingVarsList, VarSet,
+				AppendVarNums, !IO),
+			io__write_string("\n", !IO)
+		;
+			true
+		),
 
 		ConsumingVars = GoalInfo ^ consuming_vars,
-		set__to_sorted_list(ConsumingVars, ConsumingVarsList),
-		hlds_out__write_indent(Indent, !IO),
-		io__write_string("% consuming vars: ", !IO),
-		mercury_output_vars(ConsumingVarsList, VarSet, AppendVarNums,
-			!IO),
-		io__write_string("\n", !IO),
+		( set__non_empty(ConsumingVars) ->
+			set__to_sorted_list(ConsumingVars, ConsumingVarsList),
+			hlds_out__write_indent(Indent, !IO),
+			io__write_string("% consuming vars: ", !IO),
+			mercury_output_vars(ConsumingVarsList, VarSet,
+				AppendVarNums, !IO),
+			io__write_string("\n", !IO)
+		;
+			true
+		),
 
 		MakeVisibleVars = GoalInfo ^ make_visible_vars,
-		set__to_sorted_list(MakeVisibleVars, MakeVisibleVarsList),
-		hlds_out__write_indent(Indent, !IO),
-		io__write_string("% make_visible vars: ", !IO),
-		mercury_output_vars(MakeVisibleVarsList, VarSet, AppendVarNums,
-			!IO),
-		io__write_string("\n", !IO),
+		( set__non_empty(MakeVisibleVars) ->
+			set__to_sorted_list(MakeVisibleVars,
+				MakeVisibleVarsList),
+			hlds_out__write_indent(Indent, !IO),
+			io__write_string("% make_visible vars: ", !IO),
+			mercury_output_vars(MakeVisibleVarsList, VarSet,
+				AppendVarNums, !IO),
+			io__write_string("\n", !IO)
+		;
+			true
+		),
 
 		NeedVisibleVars = GoalInfo ^ need_visible_vars,
-		set__to_sorted_list(NeedVisibleVars, NeedVisibleVarsList),
-		hlds_out__write_indent(Indent, !IO),
-		io__write_string("% need_visible vars: ", !IO),
-		mercury_output_vars(NeedVisibleVarsList, VarSet, AppendVarNums,
-			!IO),
-		io__write_string("\n", !IO)
+		( set__non_empty(NeedVisibleVars) ->
+			set__to_sorted_list(NeedVisibleVars,
+				NeedVisibleVarsList),
+			hlds_out__write_indent(Indent, !IO),
+			io__write_string("% need_visible vars: ", !IO),
+			mercury_output_vars(NeedVisibleVarsList, VarSet,
+				AppendVarNums, !IO),
+			io__write_string("\n", !IO)
+		;
+			true
+		)
 	;
 		true
 	),
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------