From 2a1f376c5db3ef8259f14ae329e2834bfead4224 Mon Sep 17 00:00:00 2001 From: Zoltan Somogyi Date: Sat, 6 Dec 2025 10:39:04 +1100 Subject: [PATCH] Use spaces in all Mercury.options files. Use consistent indentation. Sort many blocks of module-specific MCFLAGS settings by module name. Add XXXs about some questionable options. --- browser/Mercury.options | 6 +- compiler/Mercury.options | 10 +- deep_profiler/Mercury.options | 10 +- extras/base64/Mercury.options | 9 +- extras/fixed/Mercury.options | 4 + .../graphics/mercury_allegro/Mercury.options | 16 +- .../mercury_allegro/examples/Mercury.options | 6 + .../samples/demo/Mercury.options | 6 + .../samples/mandel/Mercury.options | 6 + .../samples/pendulum2/Mercury.options | 6 + .../samples/speed/Mercury.options | 6 + extras/graphics/mercury_cairo/Mercury.options | 21 +- .../mercury_cairo/samples/Mercury.options | 13 +- .../mercury_cairo/tutorial/Mercury.options | 13 +- extras/graphics/mercury_glfw/Mercury.options | 12 +- extras/graphics/mercury_glut/Mercury.options | 4 + .../graphics/mercury_opengl/Mercury.options | 8 +- extras/graphics/mercury_tcltk/Mercury.options | 4 + extras/net/Mercury.options | 21 +- extras/odbc/Mercury.options | 32 +- extras/posix/Mercury.options | 8 +- extras/references/Mercury.options | 15 +- extras/solver_types/library/Mercury.options | 4 + extras/trail/Mercury.options | 16 +- .../sample/Mercury.options | 4 + extras/xml/Mercury.options | 4 + grade_lib/Mercury.options | 3 + library/Mercury.options | 10 +- mdbcomp/Mercury.options | 10 +- mfilterjavac/Mercury.options | 12 +- profiler/Mercury.options | 12 +- samples/solver_types/Mercury.options | 4 + slice/Mercury.options | 10 +- ssdb/Mercury.options | 10 +- tests/accumulator/Mercury.options | 4 + tests/analysis_ctgc/Mercury.options | 4 + tests/analysis_excp/Mercury.options | 4 + tests/analysis_external/Mercury.options | 17 +- tests/analysis_sharing/Mercury.options | 4 + tests/analysis_table/Mercury.options | 5 + tests/analysis_trail/Mercury.options | 5 + tests/analysis_unused_args/Mercury.options | 13 +- tests/benchmarks/Mercury.options | 3 + tests/debugger/Mercury.options | 4 +- tests/declarative_debugger/Mercury.options | 4 +- tests/dppd/Mercury.options | 3 + tests/exceptions/Mercury.options | 4 +- tests/general/Mercury.options | 4 +- tests/grade_subdirs/Mercury.options | 3 + tests/hard_coded/Mercury.options | 59 ++-- tests/invalid/Mercury.options | 174 ++++++----- tests/invalid_make_int/Mercury.options | 151 +++++----- tests/invalid_manual/Mercury.options | 3 + tests/invalid_nodepend/Mercury.options | 116 ++++---- tests/invalid_onlydepend/Mercury.options | 3 + tests/invalid_purity/Mercury.options | 19 +- tests/invalid_submodules/Mercury.options | 11 +- tests/misc_tests/Mercury.options | 4 +- tests/mmc_make/Mercury.options | 4 +- tests/par_conj/Mercury.options | 4 +- tests/purity/Mercury.options | 4 +- tests/recompilation/Mercury.options | 4 +- tests/stm/Mercury.options | 3 + tests/string_format/Mercury.options | 6 +- tests/structure_reuse/Mercury.options | 4 + tests/submodules/Mercury.options | 16 +- tests/tabling/Mercury.options | 4 +- tests/term/Mercury.options | 13 +- tests/trailing/Mercury.options | 8 +- tests/typeclasses/Mercury.options | 69 ++--- tests/valid/Mercury.options | 273 +++++++++--------- tests/valid_make_int/Mercury.options | 15 +- tests/valid_seq/Mercury.options | 22 +- tests/warnings/Mercury.options | 132 +++++---- 74 files changed, 879 insertions(+), 658 deletions(-) diff --git a/browser/Mercury.options b/browser/Mercury.options index 25ebe6c60..827958a2d 100644 --- a/browser/Mercury.options +++ b/browser/Mercury.options @@ -1,6 +1,6 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2002-2006, 2010 The University of Melbourne. # Copyright (C) 2015-2016, 2023-2025 The Mercury team. # This file may only be copied under the terms of the GNU General diff --git a/compiler/Mercury.options b/compiler/Mercury.options index 9bc796bc4..490bce328 100644 --- a/compiler/Mercury.options +++ b/compiler/Mercury.options @@ -1,13 +1,13 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2002-2009 The University of Melbourne. # Copyright (C) 2013, 2015-2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # llds_out.m contains some sanity checking code that is usually turned off. # However, the cost of checking whether they are turned off exceeds the cost of diff --git a/deep_profiler/Mercury.options b/deep_profiler/Mercury.options index 09b52a141..ac34b0c11 100644 --- a/deep_profiler/Mercury.options +++ b/deep_profiler/Mercury.options @@ -1,12 +1,12 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2002, 2005-2006, 2008-2011 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. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS-array_util += --trace minimum MCFLAGS-cliques += --trace minimum diff --git a/extras/base64/Mercury.options b/extras/base64/Mercury.options index bcbbbff20..b2484a9c0 100644 --- a/extras/base64/Mercury.options +++ b/extras/base64/Mercury.options @@ -1,7 +1,10 @@ -# The base64 module (currently) only provides a C implementation of the -# encoder / decoder. Compilation will fail if we attempt to build it -# in a non-C grade. +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# +# The base64 module (currently) only provides a C implementation of the +# encoder / decoder. Compilation will fail if we attempt to build it +# in a non-C grade. MCFLAGS += --libgrades-exclude-component java MCFLAGS += --libgrades-exclude-component csharp diff --git a/extras/fixed/Mercury.options b/extras/fixed/Mercury.options index 7da35e404..414a5fa4c 100644 --- a/extras/fixed/Mercury.options +++ b/extras/fixed/Mercury.options @@ -1,2 +1,6 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-mercury_fixed += --no-warn-nothing-exported MCFLAGS-mercury_fixed += --no-warn-unused-interface-imports diff --git a/extras/graphics/mercury_allegro/Mercury.options b/extras/graphics/mercury_allegro/Mercury.options index 95f530eab..610f6ec69 100644 --- a/extras/graphics/mercury_allegro/Mercury.options +++ b/extras/graphics/mercury_allegro/Mercury.options @@ -1,12 +1,18 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# +# # Common options which will be used by subdirectories. +# -LINKAGE = shared -MERCURY_LINKAGE = shared -MCFLAGS = --use-grade-subdirs -MCFLAGS += --warn-unused-imports +LINKAGE = shared +MERCURY_LINKAGE = shared + +MCFLAGS = --use-grade-subdirs +MCFLAGS += --warn-unused-imports # XXX LDFLAGS doesn't work so we use this hack. -MCFLAGS += --ld-flags "`allegro-config --libs`" +MCFLAGS += --ld-flags "`allegro-config --libs`" # These lines are specific to this directory. diff --git a/extras/graphics/mercury_allegro/examples/Mercury.options b/extras/graphics/mercury_allegro/examples/Mercury.options index e521f60c4..ef1db8a31 100644 --- a/extras/graphics/mercury_allegro/examples/Mercury.options +++ b/extras/graphics/mercury_allegro/examples/Mercury.options @@ -1,6 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TOP = .. include $(TOP)/Mercury.options MAIN_TARGET = exdata exhello exjoy exmouse exscroll exspline exsprite extimer + MCFLAGS += --search-lib-files-dir $(TOP) -R $(TOP) + EXTRA_LIBRARIES = mercury_allegro diff --git a/extras/graphics/mercury_allegro/samples/demo/Mercury.options b/extras/graphics/mercury_allegro/samples/demo/Mercury.options index 45fc79596..f75fd6c9d 100644 --- a/extras/graphics/mercury_allegro/samples/demo/Mercury.options +++ b/extras/graphics/mercury_allegro/samples/demo/Mercury.options @@ -1,6 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TOP = ../.. include $(TOP)/Mercury.options MAIN_TARGET = demo + MCFLAGS += --search-lib-files-dir $(TOP) -R $(TOP) + EXTRA_LIBRARIES = mercury_allegro diff --git a/extras/graphics/mercury_allegro/samples/mandel/Mercury.options b/extras/graphics/mercury_allegro/samples/mandel/Mercury.options index 663878dc4..48e7a6b70 100644 --- a/extras/graphics/mercury_allegro/samples/mandel/Mercury.options +++ b/extras/graphics/mercury_allegro/samples/mandel/Mercury.options @@ -1,6 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TOP = ../.. include $(TOP)/Mercury.options MAIN_TARGET = mandel + MCFLAGS += --search-lib-files-dir $(TOP) -R $(TOP) + EXTRA_LIBRARIES = mercury_allegro diff --git a/extras/graphics/mercury_allegro/samples/pendulum2/Mercury.options b/extras/graphics/mercury_allegro/samples/pendulum2/Mercury.options index e0d1488f8..9a9c78fae 100644 --- a/extras/graphics/mercury_allegro/samples/pendulum2/Mercury.options +++ b/extras/graphics/mercury_allegro/samples/pendulum2/Mercury.options @@ -1,6 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TOP = ../.. include $(TOP)/Mercury.options MAIN_TARGET = pendulum2 + MCFLAGS += --search-lib-files-dir $(TOP) -R $(TOP) + EXTRA_LIBRARIES = mercury_allegro diff --git a/extras/graphics/mercury_allegro/samples/speed/Mercury.options b/extras/graphics/mercury_allegro/samples/speed/Mercury.options index a2f3ac794..fa0998f2a 100644 --- a/extras/graphics/mercury_allegro/samples/speed/Mercury.options +++ b/extras/graphics/mercury_allegro/samples/speed/Mercury.options @@ -1,6 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TOP = ../.. include $(TOP)/Mercury.options MAIN_TARGET = speed + MCFLAGS += --search-lib-files-dir $(TOP) -R $(TOP) + EXTRA_LIBRARIES = mercury_allegro diff --git a/extras/graphics/mercury_cairo/Mercury.options b/extras/graphics/mercury_cairo/Mercury.options index 3b65fe4c8..431c06c69 100644 --- a/extras/graphics/mercury_cairo/Mercury.options +++ b/extras/graphics/mercury_cairo/Mercury.options @@ -1,15 +1,18 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + include Cairo.options # The cairo binding only works in C grades. # It does not work with single-precision floats. -# MCFLAGS = \ - --libgrades-exclude csharp \ - --libgrades-exclude java \ - --libgrades-exclude spf \ - --install-prefix $(INSTALL_PREFIX) \ - --cflags $(CAIRO_CFLAGS) \ - --ld-flags $(CAIRO_LDFLAGS) + --libgrades-exclude csharp \ + --libgrades-exclude java \ + --libgrades-exclude spf \ + --install-prefix $(INSTALL_PREFIX) \ + --cflags $(CAIRO_CFLAGS) \ + --ld-flags $(CAIRO_LDFLAGS) -MCFLAGS-mercury_cairo += --no-warn-nothing-exported -MCFLAGS-mercury_cairo += --no-warn-unused-interface-imports +MCFLAGS-mercury_cairo += --no-warn-nothing-exported +MCFLAGS-mercury_cairo += --no-warn-unused-interface-imports diff --git a/extras/graphics/mercury_cairo/samples/Mercury.options b/extras/graphics/mercury_cairo/samples/Mercury.options index 34df88e65..a7f0cbd10 100644 --- a/extras/graphics/mercury_cairo/samples/Mercury.options +++ b/extras/graphics/mercury_cairo/samples/Mercury.options @@ -1,13 +1,16 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + include ../Cairo.options # Where is the mercury_cairo library installed? # The current value works when it is installed in the parent directory. # You will need to modify it if that is not the case. -# MERCURY_CAIRO_DIR=../lib/mercury MCFLAGS = \ - --ml mercury_cairo \ - --mld $(MERCURY_CAIRO_DIR) \ - --cflags $(CAIRO_CFLAGS) \ - --ld-flags $(CAIRO_LDFLAGS) + --ml mercury_cairo \ + --mld $(MERCURY_CAIRO_DIR) \ + --cflags $(CAIRO_CFLAGS) \ + --ld-flags $(CAIRO_LDFLAGS) diff --git a/extras/graphics/mercury_cairo/tutorial/Mercury.options b/extras/graphics/mercury_cairo/tutorial/Mercury.options index 34df88e65..a7f0cbd10 100644 --- a/extras/graphics/mercury_cairo/tutorial/Mercury.options +++ b/extras/graphics/mercury_cairo/tutorial/Mercury.options @@ -1,13 +1,16 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + include ../Cairo.options # Where is the mercury_cairo library installed? # The current value works when it is installed in the parent directory. # You will need to modify it if that is not the case. -# MERCURY_CAIRO_DIR=../lib/mercury MCFLAGS = \ - --ml mercury_cairo \ - --mld $(MERCURY_CAIRO_DIR) \ - --cflags $(CAIRO_CFLAGS) \ - --ld-flags $(CAIRO_LDFLAGS) + --ml mercury_cairo \ + --mld $(MERCURY_CAIRO_DIR) \ + --cflags $(CAIRO_CFLAGS) \ + --ld-flags $(CAIRO_LDFLAGS) diff --git a/extras/graphics/mercury_glfw/Mercury.options b/extras/graphics/mercury_glfw/Mercury.options index 3a6440dd7..b70febd38 100644 --- a/extras/graphics/mercury_glfw/Mercury.options +++ b/extras/graphics/mercury_glfw/Mercury.options @@ -1,11 +1,15 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + include GLFW.options # The glfw binding only works in C grades. MCFLAGS = \ - --libgrades-exclude java \ - --libgrades-exclude csharp \ - --install-prefix $(INSTALL_PREFIX) \ - $(GLFW_MCFLAGS) + --libgrades-exclude java \ + --libgrades-exclude csharp \ + --install-prefix $(INSTALL_PREFIX) \ + $(GLFW_MCFLAGS) MCFLAGS-mercury_glfw += --no-warn-nothing-exported MCFLAGS-mercury_glfw += --no-warn-unused-interface-imports diff --git a/extras/graphics/mercury_glut/Mercury.options b/extras/graphics/mercury_glut/Mercury.options index 7ff2d14a5..11aba932d 100644 --- a/extras/graphics/mercury_glut/Mercury.options +++ b/extras/graphics/mercury_glut/Mercury.options @@ -1,3 +1,7 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-mercury_glut += --no-warn-nothing-exported MCFLAGS-mercury_glut += --no-warn-unused-interface-imports diff --git a/extras/graphics/mercury_opengl/Mercury.options b/extras/graphics/mercury_opengl/Mercury.options index 6b0d26ca4..ed1a34536 100644 --- a/extras/graphics/mercury_opengl/Mercury.options +++ b/extras/graphics/mercury_opengl/Mercury.options @@ -1,8 +1,12 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + +MCFLAGS = --halt-at-warn --intermodule-optimization + # Don't issue a warning because mercury_opengl doesn't export anything. MCFLAGS-mercury_opengl += --no-warn-nothing-exported MCFLAGS-mercury_opengl += --no-warn-unused-interface-imports # This is needed for a few predicates whose code is incomplete. MCFLAGS-mogl += --no-warn-inferred-erroneous - -MCFLAGS = --halt-at-warn --intermodule-optimization diff --git a/extras/graphics/mercury_tcltk/Mercury.options b/extras/graphics/mercury_tcltk/Mercury.options index 1b5ac6ed6..5c065f80c 100644 --- a/extras/graphics/mercury_tcltk/Mercury.options +++ b/extras/graphics/mercury_tcltk/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-mercury_tcltk=--no-warn-nothing-exported diff --git a/extras/net/Mercury.options b/extras/net/Mercury.options index c579a27ca..7ee4c751f 100644 --- a/extras/net/Mercury.options +++ b/extras/net/Mercury.options @@ -1,10 +1,13 @@ -# -# These options are required to get access to some reenterant versions of -# socket functions. -# -EXTRA_CFLAGS=-D_BSD_SOURCE=1 -D_DEFAULT_SOURCE=1 +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -# Workaround a bug in Mercury's pack bits optimisation. -MCFLAGS=--arg-pack-bits 0 \ - --libgrades-exclude java \ - --libgrades-exclude csharp +# These options are required to get access to some reenterant versions +# of socket functions. +EXTRA_CFLAGS = -D_BSD_SOURCE=1 -D_DEFAULT_SOURCE=1 + +# Work around a bug in Mercury's pack bits optimisation. +MCFLAGS = \ + --arg-pack-bits 0 \ + --libgrades-exclude java \ + --libgrades-exclude csharp diff --git a/extras/odbc/Mercury.options b/extras/odbc/Mercury.options index 3958f8903..8574868ba 100644 --- a/extras/odbc/Mercury.options +++ b/extras/odbc/Mercury.options @@ -1,15 +1,19 @@ -MCFLAGS-mercury_odbc += --no-warn-nothing-exported -MCFLAGS-mercury_odbc += --no-warn-unused-interface-imports +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-odbc += --no-allow-ho-insts-as-modes -MCFLAGS-odbc += --warn-dead-preds -MCFLAGS-odbc += --warn-implicit-stream-calls -MCFLAGS-odbc += --warn-inconsistent-pred-order-clauses -MCFLAGS-odbc += --warn-insts-with-functors-without-type -MCFLAGS-odbc += --warn-known-bad-format-calls -MCFLAGS-odbc += --warn-non-contiguous-clauses -MCFLAGS-odbc += --warn-non-contiguous-foreign-procs -MCFLAGS-odbc += --warn-potentially-ambiguous-pragma -MCFLAGS-odbc += --warn-suspicious-foreign-code -MCFLAGS-odbc += --warn-unknown-format-calls -MCFLAGS-odbc += --warn-unused-imports +MCFLAGS-mercury_odbc += --no-warn-nothing-exported +MCFLAGS-mercury_odbc += --no-warn-unused-interface-imports + +MCFLAGS-odbc += --no-allow-ho-insts-as-modes +MCFLAGS-odbc += --warn-dead-preds +MCFLAGS-odbc += --warn-implicit-stream-calls +MCFLAGS-odbc += --warn-inconsistent-pred-order-clauses +MCFLAGS-odbc += --warn-insts-with-functors-without-type +MCFLAGS-odbc += --warn-known-bad-format-calls +MCFLAGS-odbc += --warn-non-contiguous-clauses +MCFLAGS-odbc += --warn-non-contiguous-foreign-procs +MCFLAGS-odbc += --warn-potentially-ambiguous-pragma +MCFLAGS-odbc += --warn-suspicious-foreign-code +MCFLAGS-odbc += --warn-unknown-format-calls +MCFLAGS-odbc += --warn-unused-imports diff --git a/extras/posix/Mercury.options b/extras/posix/Mercury.options index aaf982ea3..7abc79b25 100644 --- a/extras/posix/Mercury.options +++ b/extras/posix/Mercury.options @@ -1,3 +1,7 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = \ - --libgrades-exclude java \ - --libgrades-exclude csharp + --libgrades-exclude java \ + --libgrades-exclude csharp diff --git a/extras/references/Mercury.options b/extras/references/Mercury.options index 9861e0d4d..a44a1ceb4 100644 --- a/extras/references/Mercury.options +++ b/extras/references/Mercury.options @@ -1,13 +1,16 @@ -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Copyright (C) 2011 The University of Melbourne. # Copyright (C) 2018, 2022, 2025 The Mercury team. # This file is distributed under the terms specified in COPYING.LIB. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS = \ - --use-trail \ - --use-grade-subdirs \ - --libgrades-include-component tr \ - --extra-library-header c_reference.h + --use-trail \ + --use-grade-subdirs \ + --libgrades-include-component tr \ + --extra-library-header c_reference.h MCFLAGS-global = --no-warn-nothing-exported --no-warn-unused-interface-imports diff --git a/extras/solver_types/library/Mercury.options b/extras/solver_types/library/Mercury.options index 8bdd87e40..198f3a0cc 100644 --- a/extras/solver_types/library/Mercury.options +++ b/extras/solver_types/library/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-any= --no-warn-nothing-exported --no-warn-unused-interface-imports diff --git a/extras/trail/Mercury.options b/extras/trail/Mercury.options index f32d9004c..7fdc6ee88 100644 --- a/extras/trail/Mercury.options +++ b/extras/trail/Mercury.options @@ -1,12 +1,16 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + TRAIL_INSTALL_PREFIX = . MCFLAGS = \ - --use-trail \ - --use-grade-subdirs \ - --libgrades-exclude java \ - --libgrades-exclude csharp \ - --libgrades-include tr \ - --install-prefix $(TRAIL_INSTALL_PREFIX) + --use-trail \ + --use-grade-subdirs \ + --libgrades-exclude java \ + --libgrades-exclude csharp \ + --libgrades-include tr \ + --install-prefix $(TRAIL_INSTALL_PREFIX) MCFLAGS-mercury_trail += --no-warn-nothing-exported MCFLAGS-mercury_trail += --no-warn-unused-interface-imports diff --git a/extras/windows_installer_generator/sample/Mercury.options b/extras/windows_installer_generator/sample/Mercury.options index 4c89c17c6..592a95673 100644 --- a/extras/windows_installer_generator/sample/Mercury.options +++ b/extras/windows_installer_generator/sample/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = -I.. -L.. -lwix diff --git a/extras/xml/Mercury.options b/extras/xml/Mercury.options index bab664d4a..5f5048762 100644 --- a/extras/xml/Mercury.options +++ b/extras/xml/Mercury.options @@ -1,3 +1,7 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-xml.cat += --no-warn-implicit-stream-calls MCFLAGS-xml.parse += --no-warn-implicit-stream-calls diff --git a/grade_lib/Mercury.options b/grade_lib/Mercury.options index 224945649..a98092a4e 100644 --- a/grade_lib/Mercury.options +++ b/grade_lib/Mercury.options @@ -1,2 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-grade_lib += --no-warn-include-and-non-include diff --git a/library/Mercury.options b/library/Mercury.options index 6b6218542..d19b0cb01 100644 --- a/library/Mercury.options +++ b/library/Mercury.options @@ -1,13 +1,13 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2002, 2004-2011 The University of Melbourne. # Copyright (C) 2015, 2018-2020, 2022-2025 The Mercury team # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Modules which use user-guided type specialization need to be compiled with # $(TYPE_SPEC_FLAGS) flags to make sure all calls to the builtin comparison diff --git a/mdbcomp/Mercury.options b/mdbcomp/Mercury.options index aad13ac46..a52465bed 100644 --- a/mdbcomp/Mercury.options +++ b/mdbcomp/Mercury.options @@ -1,13 +1,13 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2005-2006 The University of Melbourne. # Copyright (C) 2016, 2021, 2023, 2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS-mer_mdbcomp += --no-warn-nothing-exported --no-warn-unused-imports diff --git a/mfilterjavac/Mercury.options b/mfilterjavac/Mercury.options index 8cbf96029..ac1b14169 100644 --- a/mfilterjavac/Mercury.options +++ b/mfilterjavac/Mercury.options @@ -1,16 +1,16 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # # This directory does not (yet) need module-specific options, but it is # simpler (for e.g. tools/bootcheck) if all directories containing Mercury # code have this file. # -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# diff --git a/profiler/Mercury.options b/profiler/Mercury.options index ae904530f..671d4b0f8 100644 --- a/profiler/Mercury.options +++ b/profiler/Mercury.options @@ -1,13 +1,13 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2002, 2011 The University of Melbourne. -# Copyright (C) 2021, 2023 The Mercury team. +# Copyright (C) 2021, 2023, 2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS-snapshots += --optimise-constructor-last-call MCFLAGS-demangle_test += --no-warn-implicit-stream-calls diff --git a/samples/solver_types/Mercury.options b/samples/solver_types/Mercury.options index 3b2c3bef4..da160bf46 100644 --- a/samples/solver_types/Mercury.options +++ b/samples/solver_types/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = --use-grade-subdirs --use-trail diff --git a/slice/Mercury.options b/slice/Mercury.options index 4e42c8769..0d6e40960 100644 --- a/slice/Mercury.options +++ b/slice/Mercury.options @@ -1,12 +1,12 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2023, 2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS-mtc_diff +=--no-warn-det-decls-too-lax MCFLAGS-mdbcomp +=--no-warn-include-and-non-include diff --git a/ssdb/Mercury.options b/ssdb/Mercury.options index 22a4a918c..ce8564674 100644 --- a/ssdb/Mercury.options +++ b/ssdb/Mercury.options @@ -1,13 +1,13 @@ -#-----------------------------------------------------------------------------# -# vim: ts=4 sw=4 expandtab -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Copyright (C) 2007, 2010 The University of Melbourne. # Copyright (C) 2023-2025 The Mercury team. # This file may only be copied under the terms of the GNU General # Public License - see the file COPYING in the Mercury distribution. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# # Mercury.options - module-specific flags for Mmake and `mmc --make'. -#-----------------------------------------------------------------------------# +#---------------------------------------------------------------------------# MCFLAGS-mer_ssdb += --no-warn-nothing-exported MCFLAGS-mer_ssdb += --no-warn-unused-imports diff --git a/tests/accumulator/Mercury.options b/tests/accumulator/Mercury.options index e787c2963..273f0ec14 100644 --- a/tests/accumulator/Mercury.options +++ b/tests/accumulator/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS-ite += --infer-modes diff --git a/tests/analysis_ctgc/Mercury.options b/tests/analysis_ctgc/Mercury.options index b8125301b..ea3e5d6a1 100644 --- a/tests/analysis_ctgc/Mercury.options +++ b/tests/analysis_ctgc/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = --intermodule-analysis --structure-reuse --structure-reuse-repeat 10 diff --git a/tests/analysis_excp/Mercury.options b/tests/analysis_excp/Mercury.options index a89a8f9c1..3ae565bf0 100644 --- a/tests/analysis_excp/Mercury.options +++ b/tests/analysis_excp/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = --intermodule-analysis --analyse-exceptions diff --git a/tests/analysis_external/Mercury.options b/tests/analysis_external/Mercury.options index a564f66d9..9f94efd91 100644 --- a/tests/analysis_external/Mercury.options +++ b/tests/analysis_external/Mercury.options @@ -1,8 +1,13 @@ -MCFLAGS = --intermodule-analysis +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-ext += --ctgc -MCFLAGS-ext += --analyse-exceptions -MCFLAGS-ext += --use-trail --analyse-trail-usage -MCFLAGS-ext += --optimise-unused-args +MCFLAGS = --intermodule-analysis -MCFLAGS-ext2 += --grade none.mmsc --analyse-mm-tabling +MCFLAGS-ext += --ctgc +MCFLAGS-ext += --analyse-exceptions +MCFLAGS-ext += --use-trail --analyse-trail-usage +MCFLAGS-ext += --optimise-unused-args + +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-ext2 += --grade none.mmsc --analyse-mm-tabling diff --git a/tests/analysis_sharing/Mercury.options b/tests/analysis_sharing/Mercury.options index 955df4397..f6f3979d3 100644 --- a/tests/analysis_sharing/Mercury.options +++ b/tests/analysis_sharing/Mercury.options @@ -1 +1,5 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + MCFLAGS = --intermodule-analysis --structure-sharing diff --git a/tests/analysis_table/Mercury.options b/tests/analysis_table/Mercury.options index dc7a45bb4..cc257bfb1 100644 --- a/tests/analysis_table/Mercury.options +++ b/tests/analysis_table/Mercury.options @@ -1 +1,6 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + +# XXX Grade flags should never be included in Mercury.options files. MCFLAGS = --intermodule-analysis --grade none.mmsc --analyse-mm-tabling diff --git a/tests/analysis_trail/Mercury.options b/tests/analysis_trail/Mercury.options index dd4524b42..21cf1f2ea 100644 --- a/tests/analysis_trail/Mercury.options +++ b/tests/analysis_trail/Mercury.options @@ -1 +1,6 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + +# XXX Grade flags should never be included in Mercury.options files. MCFLAGS = --intermodule-analysis --use-trail --analyse-trail-usage diff --git a/tests/analysis_unused_args/Mercury.options b/tests/analysis_unused_args/Mercury.options index 4270dbb2d..bfe802d5b 100644 --- a/tests/analysis_unused_args/Mercury.options +++ b/tests/analysis_unused_args/Mercury.options @@ -1,6 +1,11 @@ -MCFLAGS = --intermodule-analysis +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + +MCFLAGS = --intermodule-analysis + # XXX --optimise-unused-args are listed per module to nullify the effect of # EXTRA_MCFLAGS=-O2 set on the command line as for some nightly tests. -MCFLAGS-ua_m1 += --optimise-unused-args -MCFLAGS-ua_m2 += --optimise-unused-args -MCFLAGS-ua_m3 += --optimise-unused-args +MCFLAGS-ua_m1 += --optimise-unused-args +MCFLAGS-ua_m2 += --optimise-unused-args +MCFLAGS-ua_m3 += --optimise-unused-args diff --git a/tests/benchmarks/Mercury.options b/tests/benchmarks/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/benchmarks/Mercury.options +++ b/tests/benchmarks/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/debugger/Mercury.options b/tests/debugger/Mercury.options index b6d0dc110..4eca1a33b 100644 --- a/tests/debugger/Mercury.options +++ b/tests/debugger/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # The completion test requires mdb to use readline, even though # the input is not a terminal. diff --git a/tests/declarative_debugger/Mercury.options b/tests/declarative_debugger/Mercury.options index 2232af98e..b4a19b328 100644 --- a/tests/declarative_debugger/Mercury.options +++ b/tests/declarative_debugger/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-deep_sub += --trace rep --suppress-trace context MCFLAGS-exceptions += --strict-sequential diff --git a/tests/dppd/Mercury.options b/tests/dppd/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/dppd/Mercury.options +++ b/tests/dppd/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/exceptions/Mercury.options b/tests/exceptions/Mercury.options index c6bcc29b3..b055c13ac 100644 --- a/tests/exceptions/Mercury.options +++ b/tests/exceptions/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-looptest += --infer-all MCFLAGS-test_exceptions += --no-warn-simple-code --no-warn-det-decls-too-lax diff --git a/tests/general/Mercury.options b/tests/general/Mercury.options index 33da24b6b..11e9cdb4f 100644 --- a/tests/general/Mercury.options +++ b/tests/general/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # mode_inf, mode_inf_bug and mode_inference_reorder need to be compiled # with `--infer-all'. diff --git a/tests/grade_subdirs/Mercury.options b/tests/grade_subdirs/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/grade_subdirs/Mercury.options +++ b/tests/grade_subdirs/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/hard_coded/Mercury.options b/tests/hard_coded/Mercury.options index 841ec7c34..610afeeca 100644 --- a/tests/hard_coded/Mercury.options +++ b/tests/hard_coded/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-allow_stubs += --allow-stubs --no-warn-stubs MCFLAGS-allow_stubs += --infer-all --no-inform-inferred-types @@ -16,7 +18,8 @@ MCFLAGS-bug103 += --optimize-constructor-last-call MCFLAGS-bug160 += -w --optimize-peep-mkword MCFLAGS-bug240 += -O1 MCFLAGS-bug300 += --no-const-struct -MCFLAGS-bug300 += --no-const-struct --optimize-constructor-last-call +MCFLAGS-bug300 += --no-const-struct +MCFLAGS-bug300 += --optimize-constructor-last-call MCFLAGS-bug314 += --trace deep MCFLAGS-bug392 += -O0 --deforestation MCFLAGS-bug455 += --intermodule-optimization @@ -24,11 +27,13 @@ MCFLAGS-bug548 += --inlining MCFLAGS-bug567 += -O2 --merge-code-after-switch MCFLAGS-bug570 += -O2 --deforestation MCFLAGS-checked_nondet_tailcall += --checked-nondet-tailcalls -MCFLAGS-checked_nondet_tailcall_noinline += \ - --checked-nondet-tailcalls --no-inlining +MCFLAGS-checked_nondet_tailcall_noinline += --checked-nondet-tailcalls +MCFLAGS-checked_nondet_tailcall_noinline += --no-inlining MCFLAGS-cc_and_non_cc_test += --no-inlining -MCFLAGS-constraint += --constraint-propagation --enable-termination -MCFLAGS-constraint_order += --constraint-propagation --enable-termination +MCFLAGS-constraint += --constraint-propagation +MCFLAGS-constraint += --enable-termination +MCFLAGS-constraint_order += --constraint-propagation +MCFLAGS-constraint_order += --enable-termination MCFLAGS-coerce_opt += --intermodule-optimization MCFLAGS-deforest_cc_bug += --deforestation MCFLAGS-delay_partial_test_1 += --delay-partial-instantiations @@ -178,20 +183,33 @@ MCFLAGS-trace_goal_3 += --trace-flag=abc MCFLAGS-trace_goal_env_1 += --trace-flag=abc MCFLAGS-trace_goal_env_2 += --trace-flag=abc MCFLAGS-trace_goal_opt += --intermod-opt -MCFLAGS-trans_intermod_user_equality += \ - --intermodule-optimization --transitive-intermodule-optimization -MCFLAGS-trans_intermod_user_equality2 += \ - --intermodule-optimization --transitive-intermodule-optimization -MCFLAGS-trans_intermod_user_equality3 += \ - --intermodule-optimization --transitive-intermodule-optimization -MCFLAGS-type_qual += --infer-all --from-ground-term-threshold=4 -MCFLAGS-type_spec += --user-guided-type-specialization +MCFLAGS-trans_intermod_user_equality += --intermodule-optimization +MCFLAGS-trans_intermod_user_equality += --transitive-intermodule-optimization +MCFLAGS-trans_intermod_user_equality2 += --intermodule-optimization +MCFLAGS-trans_intermod_user_equality2 += --transitive-intermodule-optimization +MCFLAGS-trans_intermod_user_equality3 += --intermodule-optimization +MCFLAGS-trans_intermod_user_equality3 += --transitive-intermodule-optimization +MCFLAGS-type_qual += --infer-all +MCFLAGS-type_qual += --from-ground-term-threshold=4 +MCFLAGS-type_spec += --user-guided-type-specialization MCFLAGS-existential_types_test += --infer-all MCFLAGS-existential_float += --infer-all MCFLAGS-user_defined_equality_1 += --infer-all MCFLAGS-parse += --trace rep MCFLAGS-unused_float_box_test += --infer-all +MCFLAGS-constant_prop_1 += --optimize-constant-propagation +MCFLAGS-constant_prop_1 += --trace-optimized + +MCFLAGS-constant_prop_2 += --optimize-constant-propagation +MCFLAGS-constant_prop_2 += --optimize-dead-procs --trace-optimized + +MCFLAGS-constant_prop_int += --optimize-constant-propagation + +MCFLAGS-constant_prop_loop_inv += --optimize-constant-propagation +MCFLAGS-constant_prop_loop_inv += --optimize-dead-procs --trace-optimized +MCFLAGS-constant_prop_loop_inv += --loop-invariants + # XXX MSVC - this won't work due to the object file extension being hardcoded # to ".o". MCFLAGS-target_mlobjs += --pre-link-command "mmake target_mlobjs_c.o" @@ -219,7 +237,8 @@ CFLAGS-no_refs_to_deleted_labels += -DMR_DEBUG_LABEL_NAMES MLFLAGS-parse += --trace MLFLAGS-split-c-files += --trace -MLFLAGS-needs_init += --include-initialization-code --extra-inits +MLFLAGS-needs_init += --include-initialization-code +MLFLAGS-needs_init += --extra-inits # These tests run out of memory in non-GC grades # unless we increase the heap size from the default 4M. @@ -231,13 +250,3 @@ MLFLAGS-needs_init += --include-initialization-code --extra-inits MLFLAGS-integer_test += \ --runtime-flags "--heap-size 70000 --mdb-out \"mdb\\mdb out\"" MLFLAGS-rational_test += --runtime-flags "--heap-size 20000" - -MCFLAGS-constant_prop_1 += \ - --optimize-constant-propagation --trace-optimized -MCFLAGS-constant_prop_2 += \ - --optimize-constant-propagation --optimize-dead-procs --trace-optimized -MCFLAGS-constant_prop_int += \ - --optimize-constant-propagation -MCFLAGS-constant_prop_loop_inv += \ - --optimize-constant-propagation --optimize-dead-procs --trace-optimized \ - --loop-invariants diff --git a/tests/invalid/Mercury.options b/tests/invalid/Mercury.options index 50dae5f86..3c2838472 100644 --- a/tests/invalid/Mercury.options +++ b/tests/invalid/Mercury.options @@ -1,5 +1,7 @@ -# vim: ts=4 sw=4 expandtab -# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + # Inter-module optimization changes the diagnostics for some tests # (in most cases reporting diagnostics when writing the `.opt' file). # For those tests, we just disable inter-module optimization. @@ -10,8 +12,8 @@ MCFLAGS-any_mode += --infer-types # doesn't know whether items imported from `.opt' files were imported # in the interface or the implementation. The error is reported correctly # when building the `.opt' file. -MCFLAGS-assert_in_interface += --no-intermodule-optimization \ - --verbose-error-messages +MCFLAGS-assert_in_interface += --no-intermodule-optimization +MCFLAGS-assert_in_interface += -E MCFLAGS-abstract_eqv += --no-intermodule-optimization MCFLAGS-actual_expected += --no-intermodule-optimization @@ -19,78 +21,74 @@ MCFLAGS-actual_more_expected += -E MCFLAGS-any_to_ground_in_ite_cond_nomax += --no-max-error-line-width MCFLAGS-bad_ambiguity_msg += -E MCFLAGS-bad_exported_mode += --infer-all --no-intermodule-optimization -MCFLAGS-bug150_bad_color += --ignore-color-scheme-envvar \ - --color-scheme specified@holy=8:hint=cow -MCFLAGS-bug150_partial_color += --ignore-color-scheme-envvar \ - --color-scheme specified@incorrect=203 +MCFLAGS-bug150_bad_color += --ignore-color-scheme-envvar +MCFLAGS-bug150_bad_color += --color-scheme specified@holy=8:hint=cow +MCFLAGS-bug150_partial_color += --ignore-color-scheme-envvar +MCFLAGS-bug150_partial_color += --color-scheme specified@incorrect=203 # Intermodule optimization changes the number of an unnamed variable # whose automatically-constructed "name" shows up in the .err file. -MCFLAGS-bug214 += --allow-stubs --no-warn-stubs \ - --no-intermodule-optimization +MCFLAGS-bug214 += --allow-stubs --no-warn-stubs +MCFLAGS-bug214 += --no-intermodule-optimization # Mantis bug 238 shows up in bug238.m only with --constraint-propagation. MCFLAGS-bug238 += --constraint-propagation MCFLAGS-children += --no-intermodule-optimization MCFLAGS-coerce_implied_mode += --halt-at-warn MCFLAGS-coerce_infer += --infer-all -MCFLAGS-coerce_typecheck_eqv += --no-intermodule-optimization +MCFLAGS-coerce_typecheck_eqv += --no-intermodule-optimization MCFLAGS-coerce_typecheck_eqv_helper_1 += --no-intermodule-optimization MCFLAGS-coerce_void += --halt-at-warn MCFLAGS-duplicate_instance += --no-intermodule-optimization MCFLAGS-duplicate_instance_helper_1 += --no-intermodule-optimization -MCFLAGS-ee_invalid += --verbose-error-messages +MCFLAGS-ee_invalid += -E MCFLAGS-exported_mode += --infer-all --no-intermodule-optimization MCFLAGS-exported_unify += --no-intermodule-optimization -MCFLAGS-fe_unmapped_verbose += --verbose-error-messages -MCFLAGS-foreign_decl_line_number += --no-errorcheck-only --line-numbers \ - --line-numbers-for-c-headers -MCFLAGS-foreign_enum_invalid += --verbose-error-messages +MCFLAGS-fe_unmapped_verbose += -E +MCFLAGS-foreign_decl_line_number += --no-errorcheck-only +MCFLAGS-foreign_decl_line_number += --line-numbers --line-numbers-for-c-headers +MCFLAGS-foreign_enum_invalid += -E MCFLAGS-foreign_include_file_missing += --canonicalize-error-path-names -MCFLAGS-foreign_type_line_number += --no-errorcheck-only --line-numbers \ - --compile-only +MCFLAGS-foreign_type_line_number += --no-errorcheck-only +MCFLAGS-foreign_type_line_number += --line-numbers --compile-only MCFLAGS-foreign_type_2 += --no-intermodule-optimization MCFLAGS-foreign_type_visibility += --no-intermodule-optimization MCFLAGS-gh72_errors += --no-errorcheck-only -MCFLAGS-illtyped_compare += --no-intermodule-optimization \ - --verbose-error-messages -MCFLAGS-impure_method_impl += --no-intermodule-optimization \ - --verbose-error-messages \ - --warn-too-private-instances +MCFLAGS-illtyped_compare += --no-intermodule-optimization -E +MCFLAGS-impure_method_impl += --no-intermodule-optimization -E +MCFLAGS-impure_method_impl += --warn-too-private-instances MCFLAGS-inconsistent_instances += --warn-too-private-instances MCFLAGS-inline_conflict += --no-warn-ambiguous-pragmas MCFLAGS-instances_pc += --no-intermodule-optimization MCFLAGS-instances_pc.instances_pc_helper_1 += --no-intermodule-optimization MCFLAGS-invalid_event += --event-set-file-name invalid_event_spec -MCFLAGS-invalid_mllibs += --no-errorcheck-only --no-verbose-make \ - --options-file Mercury.options.invalid \ - --make invalid_mllibs -MCFLAGS-instance_var_bug += --verbose-error-messages -MCFLAGS-loopcheck += --warn-inferred-erroneous \ - --verbose-error-messages -MCFLAGS-max_error_line_width += --max-error-line-width 120 \ - --verbose-error-messages -MCFLAGS-method_impl += --no-intermodule-optimization \ - --verbose-error-messages \ - --warn-too-private-instances -MCFLAGS-missing_det_decls += --no-infer-det --verbose-error-messages +# XXX Opmode flags should never be included in Mercury.options files. +MCFLAGS-invalid_mllibs += --no-errorcheck-only --no-verbose-make +MCFLAGS-invalid_mllibs += --options-file Mercury.options.invalid +MCFLAGS-invalid_mllibs += --make invalid_mllibs +MCFLAGS-instance_var_bug += -E +MCFLAGS-loopcheck += --warn-inferred-erroneous -E +MCFLAGS-max_error_line_width += --max-error-line-width 120 -E +MCFLAGS-method_impl += --no-intermodule-optimization -E +MCFLAGS-method_impl += --warn-too-private-instances +MCFLAGS-missing_det_decls += --no-infer-det -E MCFLAGS-missing_interface_import2 += --no-intermodule-optimization -MCFLAGS-mode_inf += --infer-all --verbose-error-messages -MCFLAGS-mpj_1 += --infer-all --verbose-error-messages +MCFLAGS-mode_inf += --infer-all -E +MCFLAGS-mpj_1 += --infer-all -E MCFLAGS-mpj_3 += --warn-too-private-instances MCFLAGS-mpj_4 += --warn-too-private-instances -MCFLAGS-multiply_star += --verbose-error-messages -MCFLAGS-multisoln_func += --infer-types --verbose-error-messages +MCFLAGS-multiply_star += -E +MCFLAGS-multisoln_func += --infer-types -E MCFLAGS-nonexistent_import += --no-verbose-make --make nonexistent_import MCFLAGS-overloading += --no-intermodule-optimization MCFLAGS-pragma_c_code_no_det += --warn-inferred-erroneous MCFLAGS-range_restrict += --warn-too-private-instances -MCFLAGS-record_syntax_errors += --verbose-error-messages -MCFLAGS-string_format_bad += --halt-at-warn \ - --warn-known-bad-format-calls \ - --warn-unknown-format-calls -MCFLAGS-string_format_unknown += --halt-at-warn \ - --warn-known-bad-format-calls \ - --warn-unknown-format-calls -MCFLAGS-subtype_user_compare += --verbose-error-messages +MCFLAGS-record_syntax_errors += -E +MCFLAGS-string_format_bad += --halt-at-warn +MCFLAGS-string_format_bad += --warn-known-bad-format-calls +MCFLAGS-string_format_bad += --warn-unknown-format-calls +MCFLAGS-string_format_unknown += --halt-at-warn +MCFLAGS-string_format_unknown += --warn-known-bad-format-calls +MCFLAGS-string_format_unknown += --warn-unknown-format-calls +MCFLAGS-subtype_user_compare += -E MCFLAGS-synth_attr_error += --event-set-file-name synth_attr_error_spec MCFLAGS-syntax_error_event += --event-set-file-name syntax_error_event_spec @@ -98,8 +96,7 @@ MCFLAGS-syntax_error_event += --event-set-file-name syntax_error_event_spec # case the error we want to report is the absence of trailing. MCFLAGS-trailed_mutable += --no-use-trail -MCFLAGS-test_nested += --no-intermodule-optimization \ - --verbose-error-messages +MCFLAGS-test_nested += --no-intermodule-optimization -E MCFLAGS-transitive_import += --no-intermodule-optimization MCFLAGS-transitive_import2 += --no-intermodule-optimization MCFLAGS-transitive_import_class += --no-intermodule-optimization @@ -110,52 +107,49 @@ MCFLAGS-typeclass_mode += --infer-all MCFLAGS-undef_symbol += --no-intermodule-optimization # Include the verbose part of the error message where we have one. -MCFLAGS-ambiguous_method_1 += --verbose-error-messages -MCFLAGS-anys_in_negated_contexts += --verbose-error-messages -MCFLAGS-bind_in_negated += --verbose-error-messages -MCFLAGS-bug83 += --verbose-error-messages -MCFLAGS-complex_constraint_err += --verbose-error-messages -MCFLAGS-ext_type += --verbose-error-messages -MCFLAGS-ext_type_bug += --verbose-error-messages -MCFLAGS-freefree += --verbose-error-messages -MCFLAGS-ho_default_func_1 += --verbose-error-messages -MCFLAGS-ho_default_func_3 += --verbose-error-messages -MCFLAGS-ho_type_mode_bug += --verbose-error-messages -MCFLAGS-make_opt_error += --verbose-error-messages -MCFLAGS-modes_erroneous += --verbose-error-messages -MCFLAGS-mpj_4 += --verbose-error-messages -MCFLAGS-multimode_syntax += --verbose-error-messages -MCFLAGS-nullary_ho_func_error += --verbose-error-messages -MCFLAGS-one_member += --verbose-error-messages +MCFLAGS-ambiguous_method_1 += -E +MCFLAGS-anys_in_negated_contexts += -E +MCFLAGS-bind_in_negated += -E +MCFLAGS-bug83 += -E +MCFLAGS-complex_constraint_err += -E +MCFLAGS-ext_type += -E +MCFLAGS-ext_type_bug += -E +MCFLAGS-freefree += -E +MCFLAGS-ho_default_func_1 += -E +MCFLAGS-ho_default_func_3 += -E +MCFLAGS-ho_type_mode_bug += -E +MCFLAGS-make_opt_error += -E +MCFLAGS-modes_erroneous += -E +MCFLAGS-mpj_4 += -E +MCFLAGS-multimode_syntax += -E +MCFLAGS-nullary_ho_func_error += -E +MCFLAGS-one_member += -E MCFLAGS-oisu_check_add_pragma_errors += --no-halt-at-invalid-interface -MCFLAGS-polymorphic_unification += --verbose-error-messages -MCFLAGS-test_type_spec += --verbose-error-messages +MCFLAGS-polymorphic_unification += -E +MCFLAGS-test_type_spec += -E -MCFLAGS-require_tailrec_1 += -O0 --optimise-tailcalls \ - --no-warn-non-tail-recursion -MCFLAGS-require_tailrec_2 += -O0 --optimise-tailcalls \ - --warn-non-tail-recursion self -E -MCFLAGS-require_tailrec_3 += -O0 --optimise-tailcalls \ - --warn-non-tail-recursion self-and-mutual +MCFLAGS-require_tailrec_1 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_1 += --no-warn-non-tail-recursion +MCFLAGS-require_tailrec_2 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_2 += --warn-non-tail-recursion self -E +MCFLAGS-require_tailrec_3 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_3 += --warn-non-tail-recursion self-and-mutual # We compile test_feature_set in grade java because that grade is incompatible # with the features in the test require_feature_set pragma. -MCFLAGS-test_feature_set += --grade java --verbose-error-messages \ - --no-intermod-opt -MCFLAGS-tricky_assert += --verbose-error-messages -MCFLAGS-type_error_use_module += --verbose-error-messages \ - --no-intermodule-optimization -MCFLAGS-typeclass_dup_method_mode += --verbose-error-messages -MCFLAGS-typeclass_constraint_extra_var += --verbose-error-messages -MCFLAGS-typeclass_missing_det_3 += --verbose-error-messages -MCFLAGS-typeclass_test_12 += --verbose-error-messages -MCFLAGS-typeclass_test_8 += --verbose-error-messages -MCFLAGS-types += --verbose-error-messages \ - --warn-non-contiguous-clauses -MCFLAGS-type_vars += --verbose-error-messages -MCFLAGS-undef_type += --verbose-error-messages -MCFLAGS-unsatisfiable_constraint += --verbose-error-messages -MCFLAGS-user_eq_dummy += --verbose-error-messages +MCFLAGS-test_feature_set += --grade java --no-intermod-opt -E +MCFLAGS-tricky_assert += -E +MCFLAGS-type_error_use_module += --no-intermodule-optimization -E +MCFLAGS-typeclass_dup_method_mode += -E +MCFLAGS-typeclass_constraint_extra_var += -E +MCFLAGS-typeclass_missing_det_3 += -E +MCFLAGS-typeclass_test_12 += -E +MCFLAGS-typeclass_test_8 += -E +MCFLAGS-types += --warn-non-contiguous-clauses -E +MCFLAGS-type_vars += -E +MCFLAGS-undef_type += -E +MCFLAGS-unsatisfiable_constraint += -E +MCFLAGS-user_eq_dummy += -E MCFLAGS-ambiguous_overloading_error += --warn-unsorted-import-blocks MCFLAGS-bug10 += --warn-unsorted-import-blocks diff --git a/tests/invalid_make_int/Mercury.options b/tests/invalid_make_int/Mercury.options index 4a935639b..0881c026e 100644 --- a/tests/invalid_make_int/Mercury.options +++ b/tests/invalid_make_int/Mercury.options @@ -1,75 +1,78 @@ -# vim: ts=4 sw=4 expandtab -# (please keep these lists sorted) +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-bad_detism_category \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_end_module \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_existential_data_type \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_finalise_decl_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_foreign_type_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -E -MCFLAGS-bad_initialise_decl_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_in_interface \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_instance \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_mutable_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_tscp \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bad_type_class_constraint_intermodule \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bug17 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bug499 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-bug521 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-builtin_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-instance_no_type \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-int_impl_imports \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-missing_initial_section \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-missing_interface_import \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-missing_interface_import_test_2 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-missing_parent_import \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-pragma_export_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-redundant_import \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-sub_c \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-test_nested \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-test_type_spec_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-transitive_import \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-type_arity \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-type_vars_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-unbound_type_vars_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-undef_inst \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-undef_mode \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-undef_type_int \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-undef_type_mod_qual \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-unicode_1 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs -MCFLAGS-unicode_2 \ - += --halt-at-invalid-interface --std-int-file-not-written-msgs +# Please keep these lists sorted. + +MCFLAGS-bad_detism_category += --halt-at-invalid-interface +MCFLAGS-bad_detism_category += --std-int-file-not-written-msgs +MCFLAGS-bad_end_module += --halt-at-invalid-interface +MCFLAGS-bad_end_module += --std-int-file-not-written-msgs +MCFLAGS-bad_existential_data_type += --halt-at-invalid-interface +MCFLAGS-bad_existential_data_type += --std-int-file-not-written-msgs +MCFLAGS-bad_finalise_decl_int += --halt-at-invalid-interface +MCFLAGS-bad_finalise_decl_int += --std-int-file-not-written-msgs +MCFLAGS-bad_foreign_type_int += --halt-at-invalid-interface +MCFLAGS-bad_foreign_type_int += --std-int-file-not-written-msgs -E +MCFLAGS-bad_in_interface += --halt-at-invalid-interface +MCFLAGS-bad_in_interface += --std-int-file-not-written-msgs +MCFLAGS-bad_initialise_decl_int += --halt-at-invalid-interface +MCFLAGS-bad_initialise_decl_int += --std-int-file-not-written-msgs +MCFLAGS-bad_instance += --halt-at-invalid-interface +MCFLAGS-bad_instance += --std-int-file-not-written-msgs +MCFLAGS-bad_mutable_int += --halt-at-invalid-interface +MCFLAGS-bad_mutable_int += --std-int-file-not-written-msgs +MCFLAGS-bad_tscp += --halt-at-invalid-interface +MCFLAGS-bad_tscp += --std-int-file-not-written-msgs +MCFLAGS-bad_type_class_constraint_intermodule += --halt-at-invalid-interface +MCFLAGS-bad_type_class_constraint_intermodule += --std-int-file-not-written-msgs +MCFLAGS-bug17 += --halt-at-invalid-interface +MCFLAGS-bug17 += --std-int-file-not-written-msgs +MCFLAGS-bug499 += --halt-at-invalid-interface +MCFLAGS-bug499 += --std-int-file-not-written-msgs +MCFLAGS-bug521 += --halt-at-invalid-interface +MCFLAGS-bug521 += --std-int-file-not-written-msgs +MCFLAGS-builtin_int += --halt-at-invalid-interface +MCFLAGS-builtin_int += --std-int-file-not-written-msgs +MCFLAGS-instance_no_type += --halt-at-invalid-interface +MCFLAGS-instance_no_type += --std-int-file-not-written-msgs +MCFLAGS-int_impl_imports += --halt-at-invalid-interface +MCFLAGS-int_impl_imports += --std-int-file-not-written-msgs +MCFLAGS-missing_initial_section += --halt-at-invalid-interface +MCFLAGS-missing_initial_section += --std-int-file-not-written-msgs +MCFLAGS-missing_interface_import += --halt-at-invalid-interface +MCFLAGS-missing_interface_import += --std-int-file-not-written-msgs +MCFLAGS-missing_interface_import_test_2 += --halt-at-invalid-interface +MCFLAGS-missing_interface_import_test_2 += --std-int-file-not-written-msgs +MCFLAGS-missing_parent_import += --halt-at-invalid-interface +MCFLAGS-missing_parent_import += --std-int-file-not-written-msgs +MCFLAGS-pragma_export_int += --halt-at-invalid-interface +MCFLAGS-pragma_export_int += --std-int-file-not-written-msgs +MCFLAGS-redundant_import += --halt-at-invalid-interface +MCFLAGS-redundant_import += --std-int-file-not-written-msgs +MCFLAGS-sub_c += --halt-at-invalid-interface +MCFLAGS-sub_c += --std-int-file-not-written-msgs +MCFLAGS-test_nested += --halt-at-invalid-interface +MCFLAGS-test_nested += --std-int-file-not-written-msgs +MCFLAGS-test_type_spec_int += --halt-at-invalid-interface +MCFLAGS-test_type_spec_int += --std-int-file-not-written-msgs +MCFLAGS-transitive_import += --halt-at-invalid-interface +MCFLAGS-transitive_import += --std-int-file-not-written-msgs +MCFLAGS-type_arity += --halt-at-invalid-interface +MCFLAGS-type_arity += --std-int-file-not-written-msgs +MCFLAGS-type_vars_int += --halt-at-invalid-interface +MCFLAGS-type_vars_int += --std-int-file-not-written-msgs +MCFLAGS-unbound_type_vars_int += --halt-at-invalid-interface +MCFLAGS-unbound_type_vars_int += --std-int-file-not-written-msgs +MCFLAGS-undef_inst += --halt-at-invalid-interface +MCFLAGS-undef_inst += --std-int-file-not-written-msgs +MCFLAGS-undef_mode += --halt-at-invalid-interface +MCFLAGS-undef_mode += --std-int-file-not-written-msgs +MCFLAGS-undef_type_int += --halt-at-invalid-interface +MCFLAGS-undef_type_int += --std-int-file-not-written-msgs +MCFLAGS-undef_type_mod_qual += --halt-at-invalid-interface +MCFLAGS-undef_type_mod_qual += --std-int-file-not-written-msgs +MCFLAGS-unicode_1 += --halt-at-invalid-interface +MCFLAGS-unicode_1 += --std-int-file-not-written-msgs +MCFLAGS-unicode_2 += --halt-at-invalid-interface +MCFLAGS-unicode_2 += --std-int-file-not-written-msgs diff --git a/tests/invalid_manual/Mercury.options b/tests/invalid_manual/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/invalid_manual/Mercury.options +++ b/tests/invalid_manual/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/invalid_nodepend/Mercury.options b/tests/invalid_nodepend/Mercury.options index 304746d38..585756a2e 100644 --- a/tests/invalid_nodepend/Mercury.options +++ b/tests/invalid_nodepend/Mercury.options @@ -1,61 +1,57 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-bad_foreign_type += --verbose-error-messages -MCFLAGS-bad_pragma += --no-halt-at-invalid-interface -MCFLAGS-bigtest += --no-halt-at-invalid-interface -MCFLAGS-bigtest += --verbose-error-messages -MCFLAGS-constrained_poly_insts += --no-halt-at-invalid-interface -MCFLAGS-duplicate_modes += --verbose-error-messages -MCFLAGS-errors_1 += --no-halt-at-invalid-interface -MCFLAGS-errors_2 += --no-halt-at-invalid-interface -MCFLAGS-errors_2 += --verbose-error-messages -MCFLAGS-errors_2 += --warn-unsorted-import-block -MCFLAGS-errors_3 += --no-halt-at-invalid-interface -MCFLAGS-exist_cons_repeated_tvar += --no-halt-at-invalid-interface -MCFLAGS-external += --no-halt-at-invalid-interface -MCFLAGS-func_errors += --no-halt-at-invalid-interface -MCFLAGS-funcs_as_preds += --no-halt-at-invalid-interface -MCFLAGS-funcs_as_preds += --warn-unsorted-import-block -MCFLAGS-fundeps_unbound_in_ctor += --no-halt-at-invalid-interface -MCFLAGS-fundeps_unbound_in_ctor += --verbose-error-messages -MCFLAGS-impl_def_literal_syntax += --no-halt-at-invalid-interface -MCFLAGS-inst_list_dup += --no-halt-at-invalid-interface -MCFLAGS-instance_bug += --verbose-error-messages -MCFLAGS-invalid_binary_literal += --no-halt-at-invalid-interface -MCFLAGS-invalid_decimal_literal += --no-halt-at-invalid-interface -MCFLAGS-invalid_float_literal += --no-halt-at-invalid-interface -MCFLAGS-invalid_hex_literal += --no-halt-at-invalid-interface -MCFLAGS-invalid_main += --no-halt-at-invalid-interface -MCFLAGS-invalid_octal_literal += --no-halt-at-invalid-interface -MCFLAGS-invalid_typeclass += --no-halt-at-invalid-interface -MCFLAGS-kind += --no-halt-at-invalid-interface -MCFLAGS-no_exports += --no-halt-at-invalid-interface -MCFLAGS-no_exports += --verbose-error-messages --halt-at-warn -MCFLAGS-null_char += --no-halt-at-invalid-interface -MCFLAGS-occurs += --no-halt-at-invalid-interface -MCFLAGS-predmode += --verbose-error-messages -MCFLAGS-prog_io_erroneous += --no-halt-at-invalid-interface -MCFLAGS-prog_io_erroneous += --verbose-error-messages -MCFLAGS-require_tailrec_invalid += --allow-stubs --no-warn-stubs -MCFLAGS-reserved_type_name += --no-halt-at-invalid-interface -MCFLAGS-specified += --no-halt-at-invalid-interface -MCFLAGS-subtype_invalid_supertype += --no-halt-at-invalid-interface -MCFLAGS-test_some += --no-halt-at-invalid-interface -MCFLAGS-test_with_type += --no-halt-at-invalid-interface -MCFLAGS-type_vars += --verbose-error-messages -MCFLAGS-typeclass_no_param += --no-halt-at-invalid-interface -MCFLAGS-typeclass_test_1 += --no-halt-at-invalid-interface -MCFLAGS-typeclass_test_2 += --no-halt-at-invalid-interface -MCFLAGS-typeclass_test_3 += --no-halt-at-invalid-interface -MCFLAGS-typeclass_test_3 += --verbose-error-messages -MCFLAGS-types += --no-halt-at-invalid-interface -MCFLAGS-types += --verbose-error-messages -MCFLAGS-unbound_type_vars += --verbose-error-messages -MCFLAGS-unterminated_octal_escape += --no-halt-at-invalid-interface -MCFLAGS-uu_type += --no-halt-at-invalid-interface -MCFLAGS-var_as_pred_name += --no-halt-at-invalid-interface -MCFLAGS-vars_in_wrong_places += --no-halt-at-invalid-interface -MCFLAGS-vars_in_wrong_places += --verbose-error-messages -MCFLAGS-where_abstract_enum += --no-halt-at-invalid-interface - -MCFLAGS-bug410 += --no-warn-unneeded-final-statevars +MCFLAGS-bad_foreign_type += -E +MCFLAGS-bad_pragma += --no-halt-at-invalid-interface +MCFLAGS-bigtest += --no-halt-at-invalid-interface +MCFLAGS-bigtest += -E +MCFLAGS-bug410 += --no-warn-unneeded-final-statevars +MCFLAGS-constrained_poly_insts += --no-halt-at-invalid-interface +MCFLAGS-duplicate_modes += -E +MCFLAGS-errors_1 += --no-halt-at-invalid-interface +MCFLAGS-errors_2 += --no-halt-at-invalid-interface +MCFLAGS-errors_2 += --warn-unsorted-import-block -E +MCFLAGS-errors_3 += --no-halt-at-invalid-interface +MCFLAGS-exist_cons_repeated_tvar += --no-halt-at-invalid-interface +MCFLAGS-external += --no-halt-at-invalid-interface +MCFLAGS-func_errors += --no-halt-at-invalid-interface +MCFLAGS-funcs_as_preds += --no-halt-at-invalid-interface +MCFLAGS-funcs_as_preds += --warn-unsorted-import-block +MCFLAGS-fundeps_unbound_in_ctor += --no-halt-at-invalid-interface -E +MCFLAGS-impl_def_literal_syntax += --no-halt-at-invalid-interface +MCFLAGS-inst_list_dup += --no-halt-at-invalid-interface +MCFLAGS-instance_bug += -E +MCFLAGS-invalid_binary_literal += --no-halt-at-invalid-interface +MCFLAGS-invalid_decimal_literal += --no-halt-at-invalid-interface +MCFLAGS-invalid_float_literal += --no-halt-at-invalid-interface +MCFLAGS-invalid_hex_literal += --no-halt-at-invalid-interface +MCFLAGS-invalid_main += --no-halt-at-invalid-interface +MCFLAGS-invalid_octal_literal += --no-halt-at-invalid-interface +MCFLAGS-invalid_typeclass += --no-halt-at-invalid-interface +MCFLAGS-kind += --no-halt-at-invalid-interface +MCFLAGS-no_exports += --no-halt-at-invalid-interface +MCFLAGS-no_exports += -E --halt-at-warn +MCFLAGS-null_char += --no-halt-at-invalid-interface +MCFLAGS-occurs += --no-halt-at-invalid-interface +MCFLAGS-predmode += -E +MCFLAGS-prog_io_erroneous += --no-halt-at-invalid-interface -E +MCFLAGS-require_tailrec_invalid += --allow-stubs --no-warn-stubs +MCFLAGS-reserved_type_name += --no-halt-at-invalid-interface +MCFLAGS-specified += --no-halt-at-invalid-interface +MCFLAGS-subtype_invalid_supertype += --no-halt-at-invalid-interface +MCFLAGS-test_some += --no-halt-at-invalid-interface +MCFLAGS-test_with_type += --no-halt-at-invalid-interface +MCFLAGS-type_vars += -E +MCFLAGS-typeclass_no_param += --no-halt-at-invalid-interface +MCFLAGS-typeclass_test_1 += --no-halt-at-invalid-interface +MCFLAGS-typeclass_test_2 += --no-halt-at-invalid-interface +MCFLAGS-typeclass_test_3 += --no-halt-at-invalid-interface +MCFLAGS-typeclass_test_3 += -E +MCFLAGS-types += --no-halt-at-invalid-interface -E +MCFLAGS-unbound_type_vars += -E +MCFLAGS-unterminated_octal_escape += --no-halt-at-invalid-interface +MCFLAGS-uu_type += --no-halt-at-invalid-interface +MCFLAGS-var_as_pred_name += --no-halt-at-invalid-interface +MCFLAGS-vars_in_wrong_places += --no-halt-at-invalid-interface -E +MCFLAGS-where_abstract_enum += --no-halt-at-invalid-interface diff --git a/tests/invalid_onlydepend/Mercury.options b/tests/invalid_onlydepend/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/invalid_onlydepend/Mercury.options +++ b/tests/invalid_onlydepend/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/invalid_purity/Mercury.options b/tests/invalid_purity/Mercury.options index 20bb06d1c..39150db7e 100644 --- a/tests/invalid_purity/Mercury.options +++ b/tests/invalid_purity/Mercury.options @@ -1,11 +1,12 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + # Include the verbose part of the error message where we have one. - -MCFLAGS-impure_func_t5 += --verbose-error-messages -MCFLAGS-impure_pred_t1 += --verbose-error-messages -MCFLAGS-impure_pred_t1_fixed += --verbose-error-messages -MCFLAGS-impure_pred_t2 += --verbose-error-messages -MCFLAGS-purity_nonsense_2 += --no-halt-at-invalid-interface -MCFLAGS-purity_type_error += --verbose-error-messages - +MCFLAGS-impure_func_t5 += -E MCFLAGS-impure_par_conj += --no-warn-unneeded-final-statevars +MCFLAGS-impure_pred_t1 += -E +MCFLAGS-impure_pred_t1_fixed += -E +MCFLAGS-impure_pred_t2 += -E +MCFLAGS-purity_nonsense_2 += --no-halt-at-invalid-interface +MCFLAGS-purity_type_error += -E diff --git a/tests/invalid_submodules/Mercury.options b/tests/invalid_submodules/Mercury.options index 62a08daf5..96dac37fa 100644 --- a/tests/invalid_submodules/Mercury.options +++ b/tests/invalid_submodules/Mercury.options @@ -1,12 +1,13 @@ -# vim: ts=4 sw=4 expandtab -# +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + # Inter-module optimization changes the diagnostics for some tests # (in most cases reporting diagnostics when writing the `.opt' file). # For those tests, we just disable inter-module optimization. - MCFLAGS-exported_unify3 += --no-intermodule-optimization -MCFLAGS-import_in_parent += --no-intermodule-optimization \ - --warn-unused-imports +MCFLAGS-import_in_parent += --no-intermodule-optimization +MCFLAGS-import_in_parent += --warn-unused-imports MCFLAGS-import_in_parent.sub += --no-intermodule-optimization MCFLAGS-missing_parent_import += --no-intermodule-optimization MCFLAGS-subtype_submodule += --no-intermodule-optimization diff --git a/tests/misc_tests/Mercury.options b/tests/misc_tests/Mercury.options index aef076422..c8707e943 100644 --- a/tests/misc_tests/Mercury.options +++ b/tests/misc_tests/Mercury.options @@ -1,3 +1,5 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-pretty_print_test += --no-line-numbers diff --git a/tests/mmc_make/Mercury.options b/tests/mmc_make/Mercury.options index bba9b3f21..29b84879e 100644 --- a/tests/mmc_make/Mercury.options +++ b/tests/mmc_make/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# LIB_DIRS = install/lib/mercury diff --git a/tests/par_conj/Mercury.options b/tests/par_conj/Mercury.options index f10310592..a37363eb1 100644 --- a/tests/par_conj/Mercury.options +++ b/tests/par_conj/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-dep_par_11d += --intermod-opt diff --git a/tests/purity/Mercury.options b/tests/purity/Mercury.options index 6e88d93ea..2a83e325d 100644 --- a/tests/purity/Mercury.options +++ b/tests/purity/Mercury.options @@ -1,3 +1,5 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-purity_opt += --local-constraint-propagation --no-fully-strict diff --git a/tests/recompilation/Mercury.options b/tests/recompilation/Mercury.options index 6cee747e2..45ffe5627 100644 --- a/tests/recompilation/Mercury.options +++ b/tests/recompilation/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # typeclass_method_pragma_r calls a predicate with a # `:- pragma obsolete' declaration. diff --git a/tests/stm/Mercury.options b/tests/stm/Mercury.options index e69de29bb..26b2e5acb 100644 --- a/tests/stm/Mercury.options +++ b/tests/stm/Mercury.options @@ -0,0 +1,3 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# diff --git a/tests/string_format/Mercury.options b/tests/string_format/Mercury.options index 35d0e0d17..a41a3061a 100644 --- a/tests/string_format/Mercury.options +++ b/tests/string_format/Mercury.options @@ -1,5 +1,7 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # The heap size must be increased to avoid running out of heap # in non-gc grades. -MLFLAGS +=--runtime-flags "--heap-size 30000" +MLFLAGS += --runtime-flags "--heap-size 30000" diff --git a/tests/structure_reuse/Mercury.options b/tests/structure_reuse/Mercury.options index 190c7f2cf..f7e69dafb 100644 --- a/tests/structure_reuse/Mercury.options +++ b/tests/structure_reuse/Mercury.options @@ -1,2 +1,6 @@ +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + # As far as I (zs) can tell, no --cell-cache option was ever in the repository. # MCFLAGS-interpret=--cell-cache diff --git a/tests/submodules/Mercury.options b/tests/submodules/Mercury.options index 9d3bf46b9..87fe8221b 100644 --- a/tests/submodules/Mercury.options +++ b/tests/submodules/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-class += --no-warn-stdlib-shadowing MCFLAGS-direct_arg_cyclic += --intermod-opt @@ -8,17 +10,15 @@ MCFLAGS-direct_arg_intermod += --intermod-opt MCFLAGS-direct_arg_intermod_helper_1 += --intermod-opt MCFLAGS-direct_arg_intermod_helper_2 += --intermod-opt MCFLAGS-g12_fe_bug += --intermod-opt -MCFLAGS-g12_fe_bug.g12_fe_bug_helper_1 += --intermod-opt \ - --no-warn-unused-interface-imports +MCFLAGS-g12_fe_bug.g12_fe_bug_helper_1 += --intermod-opt +MCFLAGS-g12_fe_bug.g12_fe_bug_helper_1 += --no-warn-unused-interface-imports MCFLAGS-g12_fe_bug.g12_fe_bug_helper_2 += --intermod-opt -MCFLAGS-g12_fe_bug.g12_fe_bug_helper_2.g12_fe_bug_helper_3 += \ - --intermod-opt - -MCFLAGS-impl_def_literal += --no-intermod-opt --no-warn-simple-code -MCFLAGS-impl_def_literal.sub += --no-intermod-opt --no-warn-simple-code +MCFLAGS-g12_fe_bug.g12_fe_bug_helper_2.g12_fe_bug_helper_3 += --intermod-opt # --intermod-opt causes impl_def_literal to abort during the STM # transformation (bug #136). Its use here is disabled until that is fixed. +MCFLAGS-impl_def_literal += --no-intermod-opt --no-warn-simple-code +MCFLAGS-impl_def_literal.sub += --no-intermod-opt --no-warn-simple-code MCFLAGS-nested_intermod += --intermod-opt MCFLAGS-nested_intermod_helper_1 += --intermod-opt diff --git a/tests/tabling/Mercury.options b/tests/tabling/Mercury.options index f4d592f0a..7994712f2 100644 --- a/tests/tabling/Mercury.options +++ b/tests/tabling/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # With the Mercury system as of 17 September 1998, # tc_minimal works on some machines even in the presence of a known bug diff --git a/tests/term/Mercury.options b/tests/term/Mercury.options index e611b9709..94b31edbe 100644 --- a/tests/term/Mercury.options +++ b/tests/term/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# MCFLAGS-ack += --term-norm=simple MCFLAGS-append += --term-norm=simple @@ -10,10 +12,11 @@ MCFLAGS-dds3_14 += --term-norm=simple MCFLAGS-dds3_15 += --term-norm=simple MCFLAGS-dds3_17 += --term-norm=simple MCFLAGS-dds3_8 += --term-norm=simple -MCFLAGS-exception_analysis_test += --analyse-exceptions \ - --no-warn-inferred-erroneous --no-warn-simple-code -MCFLAGS-exception_analysis_test2 += --analyse-exceptions \ - --no-warn-inferred-erroneous +MCFLAGS-exception_analysis_test += --analyse-exceptions +MCFLAGS-exception_analysis_test += --no-warn-inferred-erroneous +MCFLAGS-exception_analysis_test += --no-warn-simple-code +MCFLAGS-exception_analysis_test2 += --analyse-exceptions +MCFLAGS-exception_analysis_test2 += --no-warn-inferred-erroneous MCFLAGS-existential_error1 += --term-norm=num-data-elems MCFLAGS-existential_error2 += --term-norm=num-data-elems MCFLAGS-existential_error3 += --term-norm=num-data-elems diff --git a/tests/trailing/Mercury.options b/tests/trailing/Mercury.options index 4dc83abf1..f2af516eb 100644 --- a/tests/trailing/Mercury.options +++ b/tests/trailing/Mercury.options @@ -1,6 +1,8 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -# Turn on trail usage optimization for these tests since that is -# what they are testing. +# Turn on trail usage optimization for these tests, +# since that is what they are testing. MCFLAGS-tu_test_1 += --analyse-trail-usage MCFLAGS-tu_test_2 += --analyse-trail-usage diff --git a/tests/typeclasses/Mercury.options b/tests/typeclasses/Mercury.options index a5c2e4268..238fbc469 100644 --- a/tests/typeclasses/Mercury.options +++ b/tests/typeclasses/Mercury.options @@ -1,38 +1,41 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-abstract_instance_helper_1 += --infer-all -MCFLAGS-abstract_instance_helper_1 += --no-inform-inferred-types -MCFLAGS-abstract_instance_helper_1 += --no-inform-inferred-modes +MCFLAGS-abstract_instance_helper_1 += --infer-all +MCFLAGS-abstract_instance_helper_1 += --no-inform-inferred-types +MCFLAGS-abstract_instance_helper_1 += --no-inform-inferred-modes -MCFLAGS-complicated_constraint += --no-inlining \ - --user-guided-type-specialization +MCFLAGS-complicated_constraint += --no-inlining +MCFLAGS-complicated_constraint += --user-guided-type-specialization -MCFLAGS-existential_type_classes += --infer-all -MCFLAGS-existential_type_classes += --no-inform-inferred-types -MCFLAGS-extra_typeinfo += --optimize-higher-order \ - --no-type-specialization --body-typeinfo-liveness -MCFLAGS-inference_test_1 += --infer-all -MCFLAGS-inference_test_1 += --no-inform-inferred-types -MCFLAGS-inference_test_1 += --no-inform-inferred-modes -MCFLAGS-inference_test_2 += --infer-all -MCFLAGS-inference_test_2 += --no-inform-inferred-types -MCFLAGS-inference_test_2 += --no-inform-inferred-modes -MCFLAGS-intermod_typeclass_bug += --intermodule-optimization -MCFLAGS-intermod_typeclass_bug_helper_1 += --intermodule-optimization -MCFLAGS-lambda_multi_constraint_same_tvar += --infer-all -MCFLAGS-lambda_multi_constraint_same_tvar += --no-inform-inferred-types -MCFLAGS-lambda_multi_constraint_same_tvar += --no-inform-inferred-modes -MCFLAGS-module_test_helper_1 += --no-inform-inferred-types -MCFLAGS-module_test_helper_1 += --no-inform-inferred-modes -MCFLAGS-no_fundep_infer += --infer-all -MCFLAGS-no_fundep_infer += --no-inform-inferred-types +MCFLAGS-existential_type_classes += --infer-all +MCFLAGS-existential_type_classes += --no-inform-inferred-types +MCFLAGS-extra_typeinfo += --optimize-higher-order +MCFLAGS-extra_typeinfo += --no-type-specialization +MCFLAGS-extra_typeinfo += --body-typeinfo-liveness +MCFLAGS-inference_test_1 += --infer-all +MCFLAGS-inference_test_1 += --no-inform-inferred-types +MCFLAGS-inference_test_1 += --no-inform-inferred-modes +MCFLAGS-inference_test_2 += --infer-all +MCFLAGS-inference_test_2 += --no-inform-inferred-types +MCFLAGS-inference_test_2 += --no-inform-inferred-modes +MCFLAGS-intermod_typeclass_bug += --intermodule-optimization +MCFLAGS-intermod_typeclass_bug_helper_1 += --intermodule-optimization +MCFLAGS-lambda_multi_constraint_same_tvar += --infer-all +MCFLAGS-lambda_multi_constraint_same_tvar += --no-inform-inferred-types +MCFLAGS-lambda_multi_constraint_same_tvar += --no-inform-inferred-modes +MCFLAGS-module_test_helper_1 += --no-inform-inferred-types +MCFLAGS-module_test_helper_1 += --no-inform-inferred-modes +MCFLAGS-no_fundep_infer += --infer-all +MCFLAGS-no_fundep_infer += --no-inform-inferred-types # Check that the exported specialized versions are still created. -MCFLAGS-type_spec_helper_1 += --no-user-guided-type-specialization -MCFLAGS-unbound_tvar += --no-user-guided-type-specialisation -MCFLAGS-unqualified_method += --intermodule-optimization -MCFLAGS-unqualified_method_helper_1 += --intermodule-optimization -MCFLAGS-unqualified_method_helper_2 += --intermodule-optimization -MCFLAGS-module_test += --infer-all -MCFLAGS-module_test_helper_1 += --infer-all -MCFLAGS-module_test_helper_2 += --infer-all +MCFLAGS-type_spec_helper_1 += --no-user-guided-type-specialization +MCFLAGS-unbound_tvar += --no-user-guided-type-specialisation +MCFLAGS-unqualified_method += --intermodule-optimization +MCFLAGS-unqualified_method_helper_1 += --intermodule-optimization +MCFLAGS-unqualified_method_helper_2 += --intermodule-optimization +MCFLAGS-module_test += --infer-all +MCFLAGS-module_test_helper_1 += --infer-all +MCFLAGS-module_test_helper_2 += --infer-all diff --git a/tests/valid/Mercury.options b/tests/valid/Mercury.options index 125b3c65a..861a3814c 100644 --- a/tests/valid/Mercury.options +++ b/tests/valid/Mercury.options @@ -1,4 +1,6 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # Some regression tests only failed with particular options enabled. # Please keep these lists sorted. @@ -12,141 +14,152 @@ include ../DEFNS_FOR_TESTS # test_mercury runs the tests using the installed libraries, so GRADEFLAGS # won't be set, but test_mercury runs the tests in at least one `.tr' grade # on all machines, so it isn't a problem. -GRADEFLAGS-complex_failure += $(GRADEFLAGS_TRAIL) -GRADEFLAGS-semi_fail_in_non_ite += $(GRADEFLAGS_TRAIL) +GRADEFLAGS-complex_failure += $(GRADEFLAGS_TRAIL) +GRADEFLAGS-semi_fail_in_non_ite += $(GRADEFLAGS_TRAIL) # The `agc*' tests currently aren't run in grades for which `.mih' # files are created, and no header files are generated in `il' grades, # so it's OK to set GRADEFLAGS for these tests. -GRADEFLAGS-agc_graph += --gc accurate -GRADEFLAGS-agc_ho_pred += --gc accurate -GRADEFLAGS-agc_ite += --gc accurate -GRADEFLAGS-agc_unbound_typevars_1 += --gc accurate -GRADEFLAGS-agc_unbound_typevars_2 += --gc accurate -GRADEFLAGS-agc_unused_in += --gc accurate +GRADEFLAGS-agc_graph += --gc accurate +GRADEFLAGS-agc_ho_pred += --gc accurate +GRADEFLAGS-agc_ite += --gc accurate +GRADEFLAGS-agc_unbound_typevars_1 += --gc accurate +GRADEFLAGS-agc_unbound_typevars_2 += --gc accurate +GRADEFLAGS-agc_unused_in += --gc accurate # The bug that this test looks for exists only in MLDS grades without any gc. -GRADEFLAGS-bug109 += --grade hlc +GRADEFLAGS-bug109 += --grade hlc -MCFLAGS-ambig_functor += --type-check-constraints -MCFLAGS-ambig_stress_test += --type-check-constraints -MCFLAGS-bad_singleton_warning += --halt-at-warn -MCFLAGS-builtin_false += --intermodule-optimization -MCFLAGS-bug36 += -O0 --no-optimize-dead-procs -MCFLAGS-bug50 += --trace deep -MCFLAGS-bug50_full += --trace deep -MCFLAGS-bug51 += -O3 -MCFLAGS-bug85 += -O0 --deforestation -MCFLAGS-bug128 += -O5 --loop-invariants -MCFLAGS-bug134 += --no-static-ground-terms \ - --no-optimize-dead-procs -MCFLAGS-bug142 += --optimise-higher-order --inline-single-use -MCFLAGS-bug159 += -w -MCFLAGS-bug180 += --profile-optimized --allow-stubs \ - --no-warn-stubs -MCFLAGS-bug271 += --allow-stubs --no-warn-stubs -MCFLAGS-bug300 += --optimize-constructor-last-call -MCFLAGS-bug457 += --loop-invariants --intermodule-optimization -MCFLAGS-bug483 += --warn-unused-imports --halt-at-warn -MCFLAGS-bug493 += --loop-invariants -MCFLAGS-bug512 += -O5 --intermodule-optimization -MCFLAGS-bug539 += --optimize-constructor-last-call -MCFLAGS-bug544 += -O5 -MCFLAGS-compl_unify_bug += -O3 -MCFLAGS-constraint_prop_bug += -O0 --common-struct \ - --local-constraint-propagation -MCFLAGS-csharp_hello += --no-intermodule-optimization -MCFLAGS-deforest_bug += -O3 -MCFLAGS-deforest_loop += -O3 --intermodule-optimization -MCFLAGS-deforest_rerun_det += -O3 --check-termination -MCFLAGS-double_vn += -O4 -MCFLAGS-equiv_solns_ia += --inlining --local-constraint-propagation -MCFLAGS-exists_cast_bug += --trace rep -O0 --optimize-saved-vars-const -MCFLAGS-explicit_quant += --halt-at-warn -MCFLAGS-foreign_underscore_var += --halt-at-warn -MCFLAGS-format_after_switch += --warn-unknown-format-calls --halt-at-warn -MCFLAGS-fzn_debug_abort += --trace rep -# XXX we should pass --ssdb-trace deep or --ss-debug to gh89 -# but that currently doesn't work in non ssdb grades. -MCFLAGS-gh89 += --intermodule-optimization -O3 --no-warn-missing-opt-files -MCFLAGS-higher_order_1 += --no-warn-det-decls-too-lax -MCFLAGS-higher_order_4 += -O3 -MCFLAGS-higher_order_implied_mode += -O-1 -MCFLAGS-ho_and_type_spec_bug += -O4 -MCFLAGS-ho_and_type_spec_bug2 += -O3 --no-inlining -MCFLAGS-impure_detism += -O5 --deep-profiling \ - --no-intermodule-optimization -MCFLAGS-inhibit_warn_test += --inhibit-warnings --halt-at-warn -MCFLAGS-instmap_generic_failure += --local-constraint-propagation -MCFLAGS-lambda_inference += --infer-all -MCFLAGS-liveness_disagree += --grade asm_fast.gc.decldebug.stseg -MCFLAGS-liveness_ite += --no-intermodule-optimization --grade none \ - --trace shallow -MCFLAGS-livevals_seq += -O5 --opt-space -MCFLAGS-livevars_shallow_1 += --no-intermodule-optimization --grade none \ - --trace shallow -MCFLAGS-livevars_shallow_2 += --no-intermodule-optimization --grade none \ - --trace shallow -MCFLAGS-lco_term += --optimize-constructor-last-call -CFLAGS-loop_in_disj += $(CFLAGS_FOR_NO_INFINITE_RECURSION) -MCFLAGS-loop_inv_bug += --common-struct --loop-invariants -MCFLAGS-mark_static_bug += --lookup-switch-size 1 -MCFLAGS-mc_bag += --prop-mode-constraints -MCFLAGS-mc_extra_nonlocals += --prop-mode-constraints -MCFLAGS-mc_graph += --prop-mode-constraints -MCFLAGS-mc_hhf_nonlocals_bug += --prop-mode-constraints -MCFLAGS-mc_implied_modes += --prop-mode-constraints -MCFLAGS-middle_rec_labels += --middle-rec -MCFLAGS-mode_selection += --no-warn-det-decls-too-lax -MCFLAGS-mode_syntax += --no-warn-det-decls-too-lax \ - --no-warn-simple-code \ - --no-warn-unresolved-polymorphism -CFLAGS-mode_syntax += $(CFLAGS_FOR_NO_INFINITE_RECURSION) -MCFLAGS-mostly_uniq_mode_inf += --infer-all -MCFLAGS-mostly_uniq_neg += --no-warn-singleton-vars -MCFLAGS-mpj_6 += --infer-all -MCFLAGS-mpj_7 += --infer-all -MCFLAGS-neg_erroneous += -O3 +MCFLAGS-ambig_functor += --type-check-constraints +MCFLAGS-ambig_stress_test += --type-check-constraints +MCFLAGS-bad_singleton_warning += --halt-at-warn +MCFLAGS-builtin_false += --intermodule-optimization +MCFLAGS-bug36 += -O0 --no-optimize-dead-procs +MCFLAGS-bug50 += --trace deep +MCFLAGS-bug50_full += --trace deep +MCFLAGS-bug51 += -O3 +MCFLAGS-bug85 += -O0 --deforestation +MCFLAGS-bug128 += -O5 --loop-invariants +MCFLAGS-bug134 += --no-static-ground-terms +MCFLAGS-bug134 += --no-optimize-dead-procs +MCFLAGS-bug142 += --optimise-higher-order +MCFLAGS-bug142 += --inline-single-use +MCFLAGS-bug159 += -w +MCFLAGS-bug180 += --profile-optimized +MCFLAGS-bug180 += --allow-stubs --no-warn-stubs +MCFLAGS-bug271 += --allow-stubs --no-warn-stubs +MCFLAGS-bug300 += --optimize-constructor-last-call +MCFLAGS-bug457 += --loop-invariants +MCFLAGS-bug457 += --intermodule-optimization +MCFLAGS-bug483 += --warn-unused-imports --halt-at-warn +MCFLAGS-bug493 += --loop-invariants +MCFLAGS-bug512 += -O5 --intermodule-optimization +MCFLAGS-bug539 += --optimize-constructor-last-call +MCFLAGS-bug544 += -O5 +MCFLAGS-compl_unify_bug += -O3 +MCFLAGS-constraint_prop_bug += -O0 --common-struct +MCFLAGS-constraint_prop_bug += --local-constraint-propagation +MCFLAGS-csharp_hello += --no-intermodule-optimization +MCFLAGS-deforest_bug += -O3 +MCFLAGS-deforest_loop += -O3 --intermodule-optimization +MCFLAGS-deforest_rerun_det += -O3 --check-termination +MCFLAGS-double_vn += -O4 +MCFLAGS-equiv_solns_ia += --inlining +MCFLAGS-equiv_solns_ia += --local-constraint-propagation +MCFLAGS-exists_cast_bug += --trace rep -O0 +MCFLAGS-exists_cast_bug += -O0 --optimize-saved-vars-const +MCFLAGS-explicit_quant += --halt-at-warn +MCFLAGS-foreign_underscore_var += --halt-at-warn +MCFLAGS-format_after_switch += --warn-unknown-format-calls +MCFLAGS-format_after_switch += --halt-at-warn +MCFLAGS-fzn_debug_abort += --trace rep +# XXX We should pass --ssdb-trace deep or --ss-debug to gh89, +# but that currently doesn't work in non-ssdb grades. +MCFLAGS-gh89 += --intermodule-optimization -O3 +MCFLAGS-gh89 += --no-warn-missing-opt-files +MCFLAGS-higher_order_1 += --no-warn-det-decls-too-lax +MCFLAGS-higher_order_4 += -O3 +MCFLAGS-higher_order_implied_mode += -O-1 +MCFLAGS-ho_and_type_spec_bug += -O4 +MCFLAGS-ho_and_type_spec_bug2 += -O3 --no-inlining +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-impure_detism += -O5 --deep-profiling +MCFLAGS-impure_detism += --no-intermodule-optimization +MCFLAGS-inhibit_warn_test += --inhibit-warnings --halt-at-warn +MCFLAGS-instmap_generic_failure += --local-constraint-propagation +MCFLAGS-lambda_inference += --infer-all +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-liveness_disagree += --grade asm_fast.gc.decldebug.stseg +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-liveness_ite += --no-intermodule-optimization +MCFLAGS-liveness_ite += --grade none --trace shallow +MCFLAGS-livevals_seq += -O5 --opt-space +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-livevars_shallow_1 += --no-intermodule-optimization +MCFLAGS-livevars_shallow_1 += --grade none --trace shallow +# XXX Grade flags should never be included in Mercury.options files. +MCFLAGS-livevars_shallow_2 += --no-intermodule-optimization +MCFLAGS-livevars_shallow_2 += --grade none --trace shallow +MCFLAGS-lco_term += --optimize-constructor-last-call +CFLAGS-loop_in_disj += $(CFLAGS_FOR_NO_INFINITE_RECURSION) +MCFLAGS-loop_inv_bug += --common-struct --loop-invariants +MCFLAGS-mark_static_bug += --lookup-switch-size 1 +MCFLAGS-mc_bag += --prop-mode-constraints +MCFLAGS-mc_extra_nonlocals += --prop-mode-constraints +MCFLAGS-mc_graph += --prop-mode-constraints +MCFLAGS-mc_hhf_nonlocals_bug += --prop-mode-constraints +MCFLAGS-mc_implied_modes += --prop-mode-constraints +MCFLAGS-middle_rec_labels += --middle-rec +MCFLAGS-mode_selection += --no-warn-det-decls-too-lax +MCFLAGS-mode_syntax += --no-warn-det-decls-too-lax +MCFLAGS-mode_syntax += --no-warn-simple-code +MCFLAGS-mode_syntax += --no-warn-unresolved-polymorphism +CFLAGS-mode_syntax += $(CFLAGS_FOR_NO_INFINITE_RECURSION) +MCFLAGS-mostly_uniq_mode_inf += --infer-all +MCFLAGS-mostly_uniq_neg += --no-warn-singleton-vars +MCFLAGS-mpj_6 += --infer-all +MCFLAGS-mpj_7 += --infer-all +MCFLAGS-neg_erroneous += -O3 MCFLAGS-negation_in_dupl_for_switch += --halt-at-warn -MCFLAGS-no_warn_format_imports += --warn-unused-imports --halt-at-warn -MCFLAGS-no_warn_obsolete += --no-warn-obsolete -MCFLAGS-no_warn_unresolved_poly += --no-warn-unresolved-polymorphism -MCFLAGS-par_dupelim += --optimize-dups -MCFLAGS-par_saved_const += -O3 --optimize-saved-vars-const -MCFLAGS-pred_with_no_modes += --infer-all -MCFLAGS-quantifier_warning += --halt-at-warn -CFLAGS-recursive_no_tag_type += $(CFLAGS_FOR_NO_INFINITE_RECURSION) -MCFLAGS-require_tailrec_1 += -O0 --optimise-tailcalls \ - --warn-non-tail-recursion self -MCFLAGS-require_tailrec_2 += -O0 --optimise-tailcalls \ - --no-warn-non-tail-recursion -MCFLAGS-require_tailrec_3 += -O0 --optimise-tailcalls \ - --warn-non-tail-recursion self-and-mutual -MCFLAGS-reuse_static += --ctgc --deforestation -MCFLAGS-reuse_static2 += --structure-reuse --loop-invariants -MCFLAGS-sharing_exist += --ctgc --structure-sharing-widening 1 -MCFLAGS-sharing_loop_1 += --ctgc --structure-sharing-widening 8 -MCFLAGS-sharing_loop_2 += --ctgc --structure-sharing-widening 10 -MCFLAGS-sharing_loop_3 += --ctgc --structure-sharing-widening 10 -MCFLAGS-simplify_bug_1 += -O-1 -MCFLAGS-simplify_bug_2 += -O3 -MCFLAGS-solver_type_bug_1 += --halt-at-warn -MCFLAGS-solv += --halt-at-warn -MCFLAGS-some_singleton += --halt-at-warn -MCFLAGS-spurious_purity_warning += --halt-at-warn -MCFLAGS-stack_opt_simplify += --optimize-saved-vars \ - --no-warn-det-decls-too-lax -MCFLAGS-state_var_mode_bug_1 += --no-warn-singleton-vars -MCFLAGS-table_no_attr += --structure-sharing -MCFLAGS-tci_spec_varmap += --deforestation --type-specialisation -MCFLAGS-time_yaowl += --allow-stubs -MCFLAGS-tuple_eqv += --smart-recompilation -MCFLAGS-two_way_unif += -O-1 -MCFLAGS-typeclass_det_warning += --halt-at-warn -MCFLAGS-type_inf_ambig_test += --infer-all -MCFLAGS-unify_typeinfo_bug += -O3 -MCFLAGS-uniq_mode_inf_bug += --infer-all -MCFLAGS-vn_float += -O5 -MCFLAGS-zero_arity += --infer-modes -MCFLAGS-unknown_warning += --no-halt-at-warn +MCFLAGS-no_warn_format_imports += --warn-unused-imports --halt-at-warn +MCFLAGS-no_warn_obsolete += --no-warn-obsolete +MCFLAGS-no_warn_unresolved_poly += --no-warn-unresolved-polymorphism +MCFLAGS-par_dupelim += --optimize-dups +MCFLAGS-par_saved_const += -O3 --optimize-saved-vars-const +MCFLAGS-pred_with_no_modes += --infer-all +MCFLAGS-quantifier_warning += --halt-at-warn +CFLAGS-recursive_no_tag_type += $(CFLAGS_FOR_NO_INFINITE_RECURSION) +MCFLAGS-require_tailrec_1 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_1 += --warn-non-tail-recursion self +MCFLAGS-require_tailrec_2 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_2 += --no-warn-non-tail-recursion +MCFLAGS-require_tailrec_3 += -O0 --optimise-tailcalls +MCFLAGS-require_tailrec_3 += --warn-non-tail-recursion self-and-mutual +MCFLAGS-reuse_static += --ctgc --deforestation +MCFLAGS-reuse_static2 += --structure-reuse --loop-invariants +MCFLAGS-sharing_exist += --ctgc --structure-sharing-widening 1 +MCFLAGS-sharing_loop_1 += --ctgc --structure-sharing-widening 8 +MCFLAGS-sharing_loop_2 += --ctgc --structure-sharing-widening 10 +MCFLAGS-sharing_loop_3 += --ctgc --structure-sharing-widening 10 +MCFLAGS-simplify_bug_1 += -O-1 +MCFLAGS-simplify_bug_2 += -O3 +MCFLAGS-solver_type_bug_1 += --halt-at-warn +MCFLAGS-solv += --halt-at-warn +MCFLAGS-some_singleton += --halt-at-warn +MCFLAGS-spurious_purity_warning += --halt-at-warn +MCFLAGS-stack_opt_simplify += --optimize-saved-vars +MCFLAGS-stack_opt_simplify += --no-warn-det-decls-too-lax +MCFLAGS-state_var_mode_bug_1 += --no-warn-singleton-vars +MCFLAGS-table_no_attr += --structure-sharing +MCFLAGS-tci_spec_varmap += --deforestation --type-specialisation +MCFLAGS-time_yaowl += --allow-stubs +MCFLAGS-tuple_eqv += --smart-recompilation +MCFLAGS-two_way_unif += -O-1 +MCFLAGS-typeclass_det_warning += --halt-at-warn +MCFLAGS-type_inf_ambig_test += --infer-all +MCFLAGS-unify_typeinfo_bug += -O3 +MCFLAGS-uniq_mode_inf_bug += --infer-all +MCFLAGS-vn_float += -O5 +MCFLAGS-zero_arity += --infer-modes +MCFLAGS-unknown_warning += --no-halt-at-warn MCFLAGS-use_import_only_for_instance += --warn-unused-imports --halt-at-warn diff --git a/tests/valid_make_int/Mercury.options b/tests/valid_make_int/Mercury.options index 1e91d8c62..84dcadf62 100644 --- a/tests/valid_make_int/Mercury.options +++ b/tests/valid_make_int/Mercury.options @@ -1,7 +1,10 @@ -# vim: ts=4 sw=4 expandtab -# (please keep these lists sorted) +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# -MCFLAGS-test_repn += --experiment1 --pack-everything \ - --type-repns-for-humans -MCFLAGS-test_repn_sub += --experiment1 --pack-everything \ - --type-repns-for-humans +# Please keep these lists sorted. + +MCFLAGS-test_repn += --experiment1 --pack-everything +MCFLAGS-test_repn += --type-repns-for-humans +MCFLAGS-test_repn_sub += --experiment1 --pack-everything +MCFLAGS-test_repn_sub += --type-repns-for-humans diff --git a/tests/valid_seq/Mercury.options b/tests/valid_seq/Mercury.options index 942e43754..983963b51 100644 --- a/tests/valid_seq/Mercury.options +++ b/tests/valid_seq/Mercury.options @@ -1,6 +1,9 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# + +# Some regression tests only fail with particular options enabled. -# Some regression tests only failed with particular options enabled. # Please keep these lists sorted. MCFLAGS-ambig_high_level += --type-check-constraints @@ -9,7 +12,6 @@ MCFLAGS-ambig_pred_helper_1 += --type-check-constraints MCFLAGS-ambig_pred_helper_2 += --type-check-constraints MCFLAGS-ambig_pred_helper_3 += --type-check-constraints MCFLAGS-ambig_pred_helper_4 += --type-check-constraints - MCFLAGS-bug100 += --halt-at-warn MCFLAGS-call_impure_in_opt += --intermodule-optimization MCFLAGS-call_impure_in_opt_helper_1 += --intermodule-optimization @@ -29,11 +31,11 @@ MCFLAGS-head_var_unify_uniq += --intermodule-optimization MCFLAGS-head_var_unify_uniq_helper_1 += --intermodule-optimization MCFLAGS-mode_from_int0_opt += --intermodule-optimization MCFLAGS-mode_from_int0_opt_helper_1 += --intermodule-optimization -MCFLAGS-opt_det_warn += --intermodule-optimization \ - --halt-at-warn -MCFLAGS-opt_det_warn_helper_1 += --intermodule-optimization \ - --halt-at-warn \ - --no-warn-inferred-erroneous +MCFLAGS-opt_det_warn += --halt-at-warn +MCFLAGS-opt_det_warn += --intermodule-optimization +MCFLAGS-opt_det_warn_helper_1 += --halt-at-warn +MCFLAGS-opt_det_warn_helper_1 += --intermodule-optimization +MCFLAGS-opt_det_warn_helper_1 += --no-warn-inferred-erroneous MCFLAGS-opt_file_quote += --intermodule-optimization MCFLAGS-opt_file_quote_helper_1 += --intermodule-optimization MCFLAGS-overload_resolution += --intermodule-optimization @@ -53,8 +55,8 @@ MCFLAGS-typeclass_in_opt += --intermodule-optimization MCFLAGS-typeclass_in_opt_helper_1 += --intermodule-optimization MCFLAGS-unused_args_type_spec += --intermod-unused-args MCFLAGS-user_eq_pred_nested += --intermodule-optimization -MCFLAGS-user_eq_pred_nested_helper_1 += --intermodule-optimization \ - --no-warn-det-decls-too-lax +MCFLAGS-user_eq_pred_nested_helper_1 += --intermodule-optimization +MCFLAGS-user_eq_pred_nested_helper_1 += --no-warn-det-decls-too-lax MCFLAGS-user_eq_pred_nonnested += --intermodule-optimization MCFLAGS-user_eq_pred_nonnested_helper_1 += --intermodule-optimization MCFLAGS-xml_event_read += --intermodule-optimization diff --git a/tests/warnings/Mercury.options b/tests/warnings/Mercury.options index 5c1441794..ece1d0497 100644 --- a/tests/warnings/Mercury.options +++ b/tests/warnings/Mercury.options @@ -1,101 +1,107 @@ -# vim: ts=4 sw=4 expandtab +#---------------------------------------------------------------------------# +# vim: ts=4 sw=4 expandtab ft=sh +#---------------------------------------------------------------------------# # XXX The warnings for this module are reported twice when compiling with # --intermodule-optimization due to a performance bug in the handling # of assertions, which causes typechecking to be run twice. -MCFLAGS-ambiguous_overloading += --no-intermodule-optimization +MCFLAGS-ambiguous_overloading += --no-intermodule-optimization -MCFLAGS-bug412 += --no-intermodule-optimization +MCFLAGS-bug412 += --no-intermodule-optimization # We need to explicitly enable these optimizations because # the arg_order_rearrangement warning doesn't show up at # lower optimization levels. -MCFLAGS-arg_order_rearrangment += --introduce-accumulators \ - --excess-assign --common-struct \ - --trace-optimized +MCFLAGS-arg_order_rearrangment += --introduce-accumulators +MCFLAGS-arg_order_rearrangment += --excess-assign +MCFLAGS-arg_order_rearrangment += --common-struct --trace-optimized -MCFLAGS-bug412 += --warn-unused-imports -MCFLAGS-duplicate_call += --warn-duplicate-calls -MCFLAGS-duplicate_const += --warn-duplicate-calls +MCFLAGS-bug412 += --warn-unused-imports +MCFLAGS-duplicate_call += --warn-duplicate-calls +MCFLAGS-duplicate_const += --warn-duplicate-calls -MCFLAGS-empty_interface += -E +MCFLAGS-empty_interface += -E -MCFLAGS-disabled_warning += --warn-unknown-format-calls -MCFLAGS-format_call_warning += --warn-unknown-format-calls +MCFLAGS-disabled_warning += --warn-unknown-format-calls +MCFLAGS-format_call_warning += --warn-unknown-format-calls -MCFLAGS-unused_args_analysis += --intermodule-analysis \ - --optimize-unused-args \ - --warn-unused-args -MCFLAGS-unused_args_analysis_helper_1 += --intermodule-analysis \ - --optimize-unused-args \ - --trace-optimized -MCFLAGS-unused_args_test += --warn-unused-args -MCFLAGS-unused_import += --warn-unused-interface-imports -MCFLAGS-inference_test += --infer-all -MCFLAGS-save += --warn-implicit-stream-calls +MCFLAGS-unused_args_analysis += --intermodule-analysis +MCFLAGS-unused_args_analysis += --optimize-unused-args +MCFLAGS-unused_args_analysis += --warn-unused-args +MCFLAGS-unused_args_analysis_helper_1 += --intermodule-analysis +MCFLAGS-unused_args_analysis_helper_1 += --optimize-unused-args +MCFLAGS-unused_args_analysis_helper_1 += --trace-optimized +MCFLAGS-unused_args_analysis += --intermodule-analysis +MCFLAGS-unused_args_analysis += --optimize-unused-args +MCFLAGS-unused_args_analysis += --warn-unused-args +MCFLAGS-unused_args_test += --warn-unused-args +MCFLAGS-unused_import += --warn-unused-interface-imports +MCFLAGS-inference_test += --infer-all +MCFLAGS-save += --warn-implicit-stream-calls # The infinite loop warning in simple_code.m doesn't show up unless # the common-struct optimization is enabled (because proving that # the recursive call is an infinite loop relies on argument equivalence # information, which is only computed when the common-struct optimization # is enabled). -MCFLAGS-simple_code += --common-struct +MCFLAGS-simple_code += --common-struct # We need to explicitly enable these optimizations because # some of the infinite recursion warnings don't show up at # lower optimization levels. -MCFLAGS-infinite_recursion += --excess-assign --common-struct +MCFLAGS-infinite_recursion += --excess-assign --common-struct -MCFLAGS-suspicious_recursion += --warn-suspicious-recursion -E +MCFLAGS-suspicious_recursion += --warn-suspicious-recursion -E -MCFLAGS-warn_stubs += --allow-stubs --warn-unused-args +MCFLAGS-warn_stubs += --allow-stubs --warn-unused-args # For tests that involve the termination analysis, we need # to make sure that it is enabled, otherwise the tests will fail. -MCFLAGS-pragma_term_conflict += --enable-termination -MCFLAGS-term_indirect_warning += --check-termination -MCFLAGS-foreign_term_invalid += --enable-termination -MCFLAGS-non_term_user_special += --enable-termination +MCFLAGS-pragma_term_conflict += --enable-termination +MCFLAGS-term_indirect_warning += --check-termination +MCFLAGS-foreign_term_invalid += --enable-termination +MCFLAGS-non_term_user_special += --enable-termination -MCFLAGS-warn_dead_procs += --warn-dead-procs --infer-all -MCFLAGS-warn_dead_procs_trace += --warn-dead-procs +MCFLAGS-warn_dead_procs += --warn-dead-procs --infer-all +MCFLAGS-warn_dead_procs_trace += --warn-dead-procs -MCFLAGS-non_stratification += --warn-non-stratification \ - --verbose-error-messages +MCFLAGS-non_stratification += --warn-non-stratification +MCFLAGS-non_stratification += --verbose-error-messages -MCFLAGS-inst_with_no_type += --warn-insts-without-matching-type \ - --intermodule-optimization \ - --no-intermodule-analysis +MCFLAGS-inst_with_no_type += --warn-insts-without-matching-type +MCFLAGS-inst_with_no_type += --intermodule-optimization +MCFLAGS-inst_with_no_type += --no-intermodule-analysis -MCFLAGS-warn_contiguous_foreign += --warn-non-contiguous-clauses \ - --no-warn-non-contiguous-foreign-procs -MCFLAGS-warn_non_contiguous += --warn-non-contiguous-foreign-procs -MCFLAGS-warn_non_contiguous_foreign += --warn-non-contiguous-foreign-procs -MCFLAGS-warn_non_contiguous_foreign_group += --warn-non-contiguous-clauses \ - --no-warn-non-contiguous-foreign-procs +MCFLAGS-warn_contiguous_foreign += --warn-non-contiguous-clauses +MCFLAGS-warn_contiguous_foreign += --no-warn-non-contiguous-foreign-procs +MCFLAGS-warn_non_contiguous += --warn-non-contiguous-foreign-procs +MCFLAGS-warn_non_contiguous_foreign += --warn-non-contiguous-foreign-procs +MCFLAGS-warn_non_contiguous_foreign_group += --warn-non-contiguous-clauses +MCFLAGS-warn_non_contiguous_foreign_group += \ + --no-warn-non-contiguous-foreign-procs -MCFLAGS-non_contiguous_decls += --warn-non-contiguous-decls -MCFLAGS-inconsistent_pred_order += --warn-inconsistent-pred-order +MCFLAGS-non_contiguous_decls += --warn-non-contiguous-decls +MCFLAGS-inconsistent_pred_order += --warn-inconsistent-pred-order -MCFLAGS-warn_self_import += --warn-simple-code -MCFLAGS-warn_return += --warn-suspicious-foreign-procs -MCFLAGS-warn_succ_ind += --warn-suspicious-foreign-procs -MCFLAGS-suspicious_foreign_code += --warn-suspicious-foreign-code +MCFLAGS-warn_self_import += --warn-simple-code +MCFLAGS-warn_return += --warn-suspicious-foreign-procs +MCFLAGS-warn_succ_ind += --warn-suspicious-foreign-procs +MCFLAGS-suspicious_foreign_code += --warn-suspicious-foreign-code -MCFLAGS-test_tscp += --inform-generated-type-spec-pragmas \ - --no-intermodule-optimization +MCFLAGS-test_tscp += --inform-generated-type-spec-pragmas +MCFLAGS-test_tscp += --no-intermodule-optimization -MCFLAGS-bug412 += --no-warn-unsorted-import-block -MCFLAGS-test_tscp += --no-warn-unsorted-import-block +MCFLAGS-bug412 += --no-warn-unsorted-import-block +MCFLAGS-test_tscp += --no-warn-unsorted-import-block -MCFLAGS-ambiguous_overloading += --warn-unsorted-import-block -MCFLAGS-save += --warn-unsorted-import-block -MCFLAGS-singleton_test += --warn-unsorted-import-block -MCFLAGS-unsorted_import_blocks += --warn-unsorted-import-block -MCFLAGS-unused_interface_import += --warn-unsorted-import-block -MCFLAGS-unused_interface_import += --warn-too-private-instances +MCFLAGS-ambiguous_overloading += --warn-unsorted-import-block +MCFLAGS-save += --warn-unsorted-import-block +MCFLAGS-singleton_test += --warn-unsorted-import-block +MCFLAGS-unsorted_import_blocks += --warn-unsorted-import-block +MCFLAGS-unused_interface_import += --warn-unsorted-import-block +MCFLAGS-unused_interface_import += --warn-too-private-instances -MCFLAGS-allow_non_contiguity_for += --warn-non-contiguous-clauses -MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for p1,p2,p3 -MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for q1,q2,q3 -MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for r1,r2,r3 +MCFLAGS-allow_non_contiguity_for += --warn-non-contiguous-clauses +MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for p1,p2,p3 +MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for q1,q2,q3 +MCFLAGS-allow_non_contiguity_for += --allow-non-contiguity-for r1,r2,r3